archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.0'

Browse source 
* PHP-8.0:
  PDO MySQL: Use mysqlnd column names
This commit is contained in:
Nikita Popov 2020-12-16 15:18:43 +01:00
commit 52435f94a3
3 changed files with 27 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/pdo_mysql/mysql_statement.c
View file

@ -619,7 +619,11 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */
if (S->H->fetch_table_names) {
cols[i].name = strpprintf(0, "%s.%s", S->fields[i].table, S->fields[i].name);
} else {
#ifdef PDO_USE_MYSQLND
cols[i].name = zend_string_copy(S->fields[i].sname);
#else
cols[i].name = zend_string_init(S->fields[i].name, S->fields[i].name_length, 0);
#endif
}
cols[i].precision = S->fields[i].decimals;