diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-16 15:18:43 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-16 15:18:43 +0100 |
| commit | 52435f94a352f4da84780b689061f92a767d11a0 (patch) | |
| tree | 61e12bc04cb9b90b5cf22512316c963c4376ca1e /ext/pdo_mysql/mysql_statement.c | |
| parent | 1c29db19d46122066be24d065924fd7052a5b5ee (diff) | |
| parent | 205d209de931d5c5e1535277531a7e4dc8a6000a (diff) | |
| download | php-git-52435f94a352f4da84780b689061f92a767d11a0.tar.gz | |
Merge branch 'PHP-8.0'
* PHP-8.0:
PDO MySQL: Use mysqlnd column names
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 3da4566068..5e0f03fbba 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -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; |