com php-src: PDO MySQL: Use correct type when setting INT_AND_FLOAT_NATIVE: ext/pdo_mysql/mysql_driver .c
| From: | Nikita Popov | Date: | Thu, 17 Dec 2020 17:50:24 +0000 |
| Subject: | com php-src: PDO MySQL: Use correct type when setting INT_AND_FLOAT_NATIVE: ext/pdo_mysql/mysql_driver .c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-114494@lists.php.net to get a copy of this message | ||
Commit: 73533c7dc9347df901e7c24a215d4a54f800ffde
Author: Nikita Popov <nikita.ppv@gmail.com> Thu, 17 Dec 2020 18:49:44 +0100
Parents: 710f3985c59ce78bc414a12f8baa34d68b06e99d
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=73533c7dc9347df901e7c24a215d4a54f800ffde
Log:
PDO MySQL: Use correct type when setting INT_AND_FLOAT_NATIVE
mysqlnd expects this to be an unsigned int, not a bool.
Changed paths:
M ext/pdo_mysql/mysql_driver.c
Diff:
diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c
index 0523b81faf0..830104952a9 100644
--- a/ext/pdo_mysql/mysql_driver.c
+++ b/ext/pdo_mysql/mysql_driver.c
@@ -827,7 +827,7 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options)
}
#ifdef PDO_USE_MYSQLND
- bool int_and_float_native = true;
+ unsigned int int_and_float_native = 1;
if (mysql_options(H->server, MYSQLND_OPT_INT_AND_FLOAT_NATIVE, (const char *)
&int_and_float_native)) {
pdo_mysql_error(dbh);
goto cleanup;