mirror of
https://github.com/php/php-src.git
synced 2024-11-24 10:24:11 +08:00
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6: Fix Bug #60052 Integer returned as a 64bit integer on X64_86 for pdo_firebird
This commit is contained in:
commit
1745ead668
@ -367,11 +367,11 @@ static int firebird_stmt_get_col(pdo_stmt_t *stmt, int colno, char **ptr, /* {{
|
||||
break;
|
||||
case SQL_LONG:
|
||||
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
|
||||
*len = slprintf(*ptr, CHAR_BUF_LEN, "%ld", *(ISC_LONG*)var->sqldata);
|
||||
*len = slprintf(*ptr, CHAR_BUF_LEN, "%d", *(ISC_LONG*)var->sqldata);
|
||||
break;
|
||||
case SQL_INT64:
|
||||
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
|
||||
*len = slprintf(*ptr, CHAR_BUF_LEN, "%" LL_MASK "d", *(ISC_INT64*)var->sqldata);
|
||||
*len = slprintf(*ptr, CHAR_BUF_LEN, "%ld" LL_MASK "d", *(ISC_INT64*)var->sqldata);
|
||||
break;
|
||||
case SQL_FLOAT:
|
||||
*ptr = FETCH_BUF(S->fetch_buf[colno], char, CHAR_BUF_LEN, NULL);
|
||||
|
Loading…
Reference in New Issue
Block a user