Forgot to merge these changes - Float conversion

diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c
index 0a4c718011165e0cc1fdbf1ae04ead40a9c4dad5..a68808c357d6a3a587ba7eca3aa92edec00774e9 100644 (file)
--- 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 3528d42f5df40a04b62f32d71f43f921dba54d51..2b397ffaad9058522e323b92420b6b91b513e078 100644 (file)
--- 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,