Author: ahristov
Date: 2007-06-28 07:28:24 +0200 (Thu, 28 Jun 2007)
New Revision: 545
Modified:
trunk/php5/ext/mysql/php_mysql.c
trunk/php5/ext/mysqli/mysqli.c
trunk/php6/ext/mysqli/mysqli.c
Log:
Add missing consts
Modified: trunk/php5/ext/mysql/php_mysql.c
===================================================================
--- trunk/php5/ext/mysql/php_mysql.c 2007-06-27 18:12:53 UTC (rev 544)
+++ trunk/php5/ext/mysql/php_mysql.c 2007-06-28 05:28:24 UTC (rev 545)
@@ -509,9 +509,7 @@
PHP_RSHUTDOWN_FUNCTION(mysql)
{
#if !defined(HAVE_MYSQLND) && defined(ZTS)
- if (mysql_thread_end()) {
- return FAILURE;
- }
+ mysql_thread_end();
#endif
if (MySG(trace_mode)) {
Modified: trunk/php5/ext/mysqli/mysqli.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli.c 2007-06-27 18:12:53 UTC (rev 544)
+++ trunk/php5/ext/mysqli/mysqli.c 2007-06-28 05:28:24 UTC (rev 545)
@@ -650,7 +650,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_CURSOR_TYPE_SCROLLABLE", CURSOR_TYPE_SCROLLABLE, CONST_CS
| CONST_PERSISTENT);
#endif
-#if MYSQL_VERSION_ID > 50007
+#if MYSQL_VERSION_ID > 50007 || defined(HAVE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_STMT_ATTR_PREFETCH_ROWS", STMT_ATTR_PREFETCH_ROWS,
CONST_CS | CONST_PERSISTENT);
#endif
@@ -696,7 +696,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_INTERVAL", FIELD_TYPE_INTERVAL, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_GEOMETRY", FIELD_TYPE_GEOMETRY, CONST_CS |
CONST_PERSISTENT);
-#if MYSQL_VERSION_ID > 50002
+#if MYSQL_VERSION_ID > 50002 || defined(HAVE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_NEWDECIMAL", FIELD_TYPE_NEWDECIMAL, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_BIT", FIELD_TYPE_BIT, CONST_CS | CONST_PERSISTENT);
#endif
Modified: trunk/php6/ext/mysqli/mysqli.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli.c 2007-06-27 18:12:53 UTC (rev 544)
+++ trunk/php6/ext/mysqli/mysqli.c 2007-06-28 05:28:24 UTC (rev 545)
@@ -654,7 +654,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_CURSOR_TYPE_SCROLLABLE", CURSOR_TYPE_SCROLLABLE, CONST_CS
| CONST_PERSISTENT);
#endif
-#if MYSQL_VERSION_ID > 50007
+#if MYSQL_VERSION_ID > 50007 || defined(HAVE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_STMT_ATTR_PREFETCH_ROWS", STMT_ATTR_PREFETCH_ROWS,
CONST_CS | CONST_PERSISTENT);
#endif
@@ -700,7 +700,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_INTERVAL", FIELD_TYPE_INTERVAL, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_GEOMETRY", FIELD_TYPE_GEOMETRY, CONST_CS |
CONST_PERSISTENT);
-#if MYSQL_VERSION_ID > 50002
+#if MYSQL_VERSION_ID > 50002 || defined(HAVE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_NEWDECIMAL", FIELD_TYPE_NEWDECIMAL, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_BIT", FIELD_TYPE_BIT, CONST_CS | CONST_PERSISTENT);
#endif
| Thread |
|---|
| • PHP mysqlnd svn commit: r545 - in trunk: php5/ext/mysql php5/ext/mysqli php6/ext/mysqli | ahristov | 28 Jun |
