diff options
| author | Xinchen Hui <laruence@php.net> | 2015-05-06 10:51:52 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-05-06 10:51:52 +0800 |
| commit | 55d94a453243cafc2292920e9c91bd2bc551f2be (patch) | |
| tree | c00d368a3c68c2e53167b8da8c6448cdb88801e7 /ext/pdo_mysql/mysql_statement.c | |
| parent | 9b3a92a1cad96ff88a61493bf688bc0757933642 (diff) | |
| parent | 63282d3321044681e880a997a6360d4b99a07d4f (diff) | |
| download | php-git-55d94a453243cafc2292920e9c91bd2bc551f2be.tar.gz | |
Merge branch 'master' of git.php.net:php-src
Diffstat (limited to 'ext/pdo_mysql/mysql_statement.c')
| -rw-r--r-- | ext/pdo_mysql/mysql_statement.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 56728ed92d..551960560e 100644 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -696,14 +696,11 @@ static int pdo_mysql_stmt_describe(pdo_stmt_t *stmt, int colno) /* {{{ */ PDO_DBG_RETURN(1); } for (i = 0; i < stmt->column_count; i++) { - int namelen; if (S->H->fetch_table_names) { - namelen = spprintf(&cols[i].name, 0, "%s.%s", S->fields[i].table, S->fields[i].name); - cols[i].namelen = namelen; + cols[i].name = strpprintf(0, "%s.%s", S->fields[i].table, S->fields[i].name); } else { - cols[i].namelen = S->fields[i].name_length; - cols[i].name = estrndup(S->fields[i].name, S->fields[i].name_length); + cols[i].name = zend_string_init(S->fields[i].name, S->fields[i].name_length, 0); } cols[i].precision = S->fields[i].decimals; |