cvs: php-src /ext/mysqlnd mysqlnd.c mysqlnd_enum_n_def.h

andrey Mon Sep 15 18:10:38 2008 UTC Modified files: /php-src/ext/mysqlnd mysqlnd.c mysqlnd_enum_n_def.h Log: Forgot to merge these changes - Float conversion http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd.c?r1=1.27&r2=1.28&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd.c diff -u php-src/ext/mysqlnd/mysqlnd.c:1.27 php-src/ext/mysqlnd/mysqlnd.c:1.28 --- php-src/ext/mysqlnd/mysqlnd.c:1.27 Tue Aug 19 10:42:00 2008 +++ php-src/ext/mysqlnd/mysqlnd.c Mon Sep 15 18:10:38 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd.c,v 1.27 2008/08/19 10:42:00 johannes Exp $ */ +/* $Id: mysqlnd.c,v 1.28 2008/09/15 18:10:38 andrey Exp $ */ #include "php.h" #include "mysqlnd.h" #include "mysqlnd_wireprotocol.h" @@ -1711,8 +1711,8 @@ 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: http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_enum_n_def.h?r1=1.9&r2=1.10&diff_format=u Index: php-src/ext/mysqlnd/mysqlnd_enum_n_def.h diff -u php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.9 php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.10 --- php-src/ext/mysqlnd/mysqlnd_enum_n_def.h:1.9 Fri Sep 12 15:06:55 2008 +++ php-src/ext/mysqlnd/mysqlnd_enum_n_def.h Mon Sep 15 18:10:38 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd_enum_n_def.h,v 1.9 2008/09/12 15:06:55 andrey Exp $ */ +/* $Id: mysqlnd_enum_n_def.h,v 1.10 2008/09/15 18:10:38 andrey Exp $ */ #ifndef MYSQLND_ENUM_N_DEF_H #define MYSQLND_ENUM_N_DEF_H @@ -136,7 +136,7 @@ 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,