PHP mysqlnd svn commit: r697 - in trunk: php5/ext/mysqli php6/ext/mysqli

Author: ahristov
Date: 2007-07-10 17:43:34 +0200 (Tue, 10 Jul 2007) New Revision: 697

Modified:

   trunk/php5/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/mysqli.c
Log:
Fix failures

Modified: trunk/php5/ext/mysqli/mysqli.c

• trunk/php5/ext/mysqli/mysqli.c 2007-07-10 13:48:29 UTC (rev 696) +++ trunk/php5/ext/mysqli/mysqli.c 2007-07-10 15:43:34 UTC (rev 697)
  @@ -378,7 +378,6 @@
  

 static union _zend_function *php_mysqli_constructor_get(zval *object TSRMLS_DC)  {

-	mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC);
 	zend_class_entry * ce = Z_OBJCE_P(object);
 
 	if (ce != mysqli_link_class_entry && ce != mysqli_stmt_class_entry &&

@@ -387,6 +386,7 @@

 		return zend_std_get_constructor(object TSRMLS_CC);
 	} else {
 		static zend_internal_function f;
+		mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC);
 
 		f.function_name = obj->zo.ce->name;
 		f.scope = obj->zo.ce;

@@ -624,7 +624,6 @@

 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_CONNECT_TIMEOUT", MYSQL_OPT_CONNECT_TIMEOUT, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE", MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND, CONST_CS | CONST_PERSISTENT);
-	REGISTER_LONG_CONSTANT("MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE", MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE, CONST_CS | CONST_PERSISTENT);
 #ifdef MYSQLND_STRING_TO_INT_CONVERSION
 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_YEAR_AS_INT", MYSQLND_OPT_INT_AND_YEAR_AS_INT, CONST_CS | CONST_PERSISTENT);

Modified: trunk/php6/ext/mysqli/mysqli.c

• trunk/php6/ext/mysqli/mysqli.c 2007-07-10 13:48:29 UTC (rev 696) +++ trunk/php6/ext/mysqli/mysqli.c 2007-07-10 15:43:34 UTC (rev 697)
  @@ -380,7 +380,6 @@
  

 static union _zend_function *php_mysqli_constructor_get(zval *object TSRMLS_DC)  {

-	mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC);
 	zend_class_entry * ce = Z_OBJCE_P(object);
 
 	if (ce != mysqli_link_class_entry && ce != mysqli_stmt_class_entry &&

@@ -389,6 +388,7 @@

 		return zend_std_get_constructor(object TSRMLS_CC);
 	} else {
 		static zend_internal_function f;
+		mysqli_object *obj = (mysqli_object *)zend_objects_get_address(object TSRMLS_CC);
 
 		f.function_name = obj->zo.ce->name;
 		f.scope = obj->zo.ce;

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com