Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix #77944: Wrong meta pdo_type for bigint on LLP64
This commit is contained in:
Christoph M. Becker 2019-04-27 18:46:57 +02:00
commit e561d4100b
2 changed files with 4 additions and 1 deletions

View file

@ -874,7 +874,7 @@ static int pdo_mysql_stmt_col_meta(pdo_stmt_t *stmt, zend_long colno, zval *retu
case MYSQL_TYPE_SHORT:
case MYSQL_TYPE_INT24:
case MYSQL_TYPE_LONG:
#if SIZEOF_LONG==8
#if SIZEOF_ZEND_LONG==8
case MYSQL_TYPE_LONGLONG:
#endif
add_assoc_long(return_value, "pdo_type", PDO_PARAM_INT);