PHP mysqlnd svn commit: r837 - in trunk: php5/ext/mysqli php6/ext/mysqli
Author: ahristov
Date: 2007-07-24 17:40:30 +0200 (Tue, 24 Jul 2007)
New Revision: 837
Modified:
trunk/php5/ext/mysqli/php_mysqli_structs.h
trunk/php6/ext/mysqli/config9.m4
trunk/php6/ext/mysqli/php_mysqli_structs.h
Log:
Fix bus errors on 64bit platforms
Modified: trunk/php5/ext/mysqli/php_mysqli_structs.h
- trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-07-24 12:16:06 UTC (rev 836)
+++ trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-07-24 15:40:30 UTC (rev 837)
@@ -340,20 +340,20 @@
long num_links;
long max_links;
long cache_size;
- unsigned int default_port;
+ unsigned long default_port;
char *default_host;
char *default_user;
char *default_socket;
char *default_pw;
- int reconnect;
- int allow_local_infile;
- int strict;
+ long reconnect;
+ long allow_local_infile;
+ long strict;
long error_no;
char *error_msg;
int report_mode;
HashTable *report_ht;
- unsigned int multi_query;
- unsigned int embedded;
+ unsigned long multi_query;
+ unsigned long embedded;
#ifdef HAVE_MYSQLND
MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache;
#endif
Modified: trunk/php6/ext/mysqli/config9.m4
- trunk/php6/ext/mysqli/config9.m4 2007-07-24 12:16:06 UTC (rev 836)
+++ trunk/php6/ext/mysqli/config9.m4 2007-07-24 15:40:30 UTC (rev 837)
@@ -3,7 +3,7 @@
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
-[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname to mysql_config [mysql_config].
+[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname to mysql_config .
If mysqlnd is passed as FILE, the MySQL native driver will be used])
PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
Modified: trunk/php6/ext/mysqli/php_mysqli_structs.h
- trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-07-24 12:16:06 UTC (rev 836)
+++ trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-07-24 15:40:30 UTC (rev 837)
@@ -352,20 +352,20 @@
long num_links;
long max_links;
long cache_size;
- unsigned int default_port;
+ unsigned long default_port;
char *default_host;
char *default_user;
char *default_socket;
char *default_pw;
- int reconnect;
- int allow_local_infile;
- int strict;
+ long reconnect;
+ long allow_local_infile;
+ long strict;
long error_no;
char *error_msg;
- int report_mode;
+ long report_mode;
HashTable *report_ht;
- unsigned int multi_query;
- unsigned int embedded;
+ unsigned long multi_query;
+ unsigned long embedded;
#ifdef HAVE_MYSQLND
MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache;
#endif
--
MySQL Code Commits Mailing List
For list archives:
http://lists.mysql.com/commits
To unsubscribe:
http://lists.mysql.com/commits?unsub=lists@pantek.com
Received on Tue Jul 24 11:40:34 2007
This archive was generated by hypermail 2.1.8
: Thu Aug 09 2007 - 19:13:02 EDT
|