From 1eb634c0e378fa3df7893a805dd137ae4498e89c Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Mon, 15 Sep 2008 18:10:38 +0000 Subject: [PATCH] Forgot to merge these changes - Float conversion --- ext/mysqlnd/mysqlnd.c | 4 ++-- ext/mysqlnd/mysqlnd_enum_n_def.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index 0a4c718011..a68808c357 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -1711,8 +1711,8 @@ MYSQLND_METHOD(mysqlnd_conn, set_client_option)(MYSQLND * const conn, conn->options.net_read_buffer_size = *(uint*) value; break; #ifdef MYSQLND_STRING_TO_INT_CONVERSION - case MYSQLND_OPT_INT_AND_YEAR_AS_INT: - conn->options.int_and_year_as_int = *(uint*) value; + case MYSQLND_OPT_INT_AND_FLOAT_NATIVE: + conn->options.int_and_float_native = *(uint*) value; break; #endif case MYSQL_OPT_CONNECT_TIMEOUT: diff --git a/ext/mysqlnd/mysqlnd_enum_n_def.h b/ext/mysqlnd/mysqlnd_enum_n_def.h index 3528d42f5d..2b397ffaad 100644 --- a/ext/mysqlnd/mysqlnd_enum_n_def.h +++ b/ext/mysqlnd/mysqlnd_enum_n_def.h @@ -136,7 +136,7 @@ typedef enum mysqlnd_option MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE = 200, #endif #ifdef MYSQLND_STRING_TO_INT_CONVERSION - MYSQLND_OPT_INT_AND_YEAR_AS_INT = 201, + MYSQLND_OPT_INT_AND_FLOAT_NATIVE = 201, #endif MYSQLND_OPT_NET_CMD_BUFFER_SIZE = 202, MYSQLND_OPT_NET_READ_BUFFER_SIZE = 203, -- 2.50.1