Hosting Provided By

PHP mysqlnd svn commit: r722 - in trunk: php5/ext/mysql php5/ext/mysqli php6/ext/mysql tests/ext/mysqli

From: <ahristov(at)mysql.com>
Date: Wed Jul 11 2007 - 17:23:20 EDT

Author: ahristov
Date: 2007-07-11 23:23:20 +0200 (Wed, 11 Jul 2007) New Revision: 722

Modified:

   trunk/php5/ext/mysql/php_mysql.c
   trunk/php5/ext/mysqli/mysqli_api.c
   trunk/php5/ext/mysqli/mysqli_nonapi.c
   trunk/php6/ext/mysql/php_mysql.c
   trunk/tests/ext/mysqli/bug35759.phpt

Log:
Fix build warnings.

Fix test - the test was faulty, but found a leak in ZE. Now it passes, no leak. We had to pass params to mysqli_stmt_bind_result() by reference.

Cosmetic changes, join #ifndef and #idfef HAVE_MYSQLND

Modified: trunk/php5/ext/mysql/php_mysql.c

trunk/php5/ext/mysql/php_mysql.c 2007-07-11 18:17:47 UTC (rev 721) +++ trunk/php5/ext/mysql/php_mysql.c 2007-07-11 21:23:20 UTC (rev 722) @@ -448,16 +448,13 @@ REGISTER_LONG_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);

-#ifdef HAVE_MYSQLND
-	mysqlnd_library_init();
-	mysql_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MySG(cache_size));
-	mysql_mysqlnd_qcache = mysqlnd_qcache_init_cache();
-#endif
-

 #ifndef HAVE_MYSQLND

 	if (mysql_server_init(0, NULL, NULL)) {
 		return FAILURE;
 	}
+#else
+	mysql_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MySG(cache_size));
+	mysql_mysqlnd_qcache = mysqlnd_qcache_init_cache();

#endif

return SUCCESS;
@@ -478,12 +475,9 @@
#else

mysql_server_end();
#endif

-#endif
-
-#ifdef HAVE_MYSQLND
+#else
 	mysqlnd_palloc_free_cache(mysql_mysqlnd_zval_cache);
 	mysqlnd_qcache_free_cache_reference(&mysql_mysqlnd_qcache);
-	mysqlnd_library_end();

#endif

UNREGISTER_INI_ENTRIES(); Modified: trunk/php5/ext/mysqli/mysqli_api.c

trunk/php5/ext/mysqli/mysqli_api.c 2007-07-11 18:17:47 UTC (rev 721) +++ trunk/php5/ext/mysqli/mysqli_api.c 2007-07-11 21:23:20 UTC (rev 722) @@ -1639,7 +1639,7 @@ php_set_local_infile_handler_default(mysql);
#endif
- mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, &MyG(allow_local_infile)); + mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char*)&MyG(allow_local_infile));

 	/* change status */
 	MYSQLI_SET_STATUS(&mysql_link, MYSQLI_STATUS_VALID);

Do you need help?

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

trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-07-11 18:17:47 UTC (rev 721) +++ trunk/php5/ext/mysqli/mysqli_nonapi.c 2007-07-11 21:23:20 UTC (rev 722) @@ -169,7 +169,7 @@ php_set_local_infile_handler_default(mysql);
#endif
- mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, &MyG(allow_local_infile)); + mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char*) &MyG(allow_local_infile));

end:

mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));

Modified: trunk/php6/ext/mysql/php_mysql.c

trunk/php6/ext/mysql/php_mysql.c 2007-07-11 18:17:47 UTC (rev 721) +++ trunk/php6/ext/mysql/php_mysql.c 2007-07-11 21:23:20 UTC (rev 722) @@ -446,15 +446,13 @@ REGISTER_LONG_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);

-#ifdef HAVE_MYSQLND
-	mysql_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MySG(cache_size));
-	mysql_mysqlnd_qcache = mysqlnd_qcache_init_cache();
-#endif
-

 #ifndef HAVE_MYSQLND

 	if (mysql_server_init(0, NULL, NULL)) {
 		return FAILURE;
 	}
+#else
+	mysql_mysqlnd_zval_cache = mysqlnd_palloc_init_cache(MySG(cache_size));
+	mysql_mysqlnd_qcache = mysqlnd_qcache_init_cache();

#endif

return SUCCESS;
@@ -475,9 +473,7 @@
#else

mysql_server_end();
#endif

-#endif
-
-#ifdef HAVE_MYSQLND
+#else
 	mysqlnd_palloc_free_cache(mysql_mysqlnd_zval_cache);
 	mysqlnd_qcache_free_cache_reference(&mysql_mysqlnd_qcache);

#endif

Modified: trunk/tests/ext/mysqli/bug35759.phpt

trunk/tests/ext/mysqli/bug35759.phpt 2007-07-11 18:17:47 UTC (rev 721) +++ trunk/tests/ext/mysqli/bug35759.phpt 2007-07-11 21:23:20 UTC (rev 722) @@ -8,8 +8,6 @@ $sql=<<<EOSQL CREATE TABLE blobby ( a1 MEDIUMBLOB NOT NULL, - - EOSQL; include "connect.inc"; $col_num= 1000; @@ -21,18 +19,21 @@ while (++$i < $col_num) { $create .= ", a$i MEDIUMBLOB NOT NULL DEFAULT ''"; } - $create .= ")"; - - $mysql->query($create); + $create .= ")"; + + $mysql->query($create); $mysql->query("INSERT INTO blobby (a0) VALUES ('')");

 	$stmt = $mysql->prepare("SELECT * FROM blobby");
 	$stmt->execute();
 	$stmt->store_result();
-	$params= array_pad(array(), $col_num, "");
-	call_user_func_array(array($stmt, "bind_result"), $params);
+	for ($i = 0; $i < $col_num; $i++) {
+		$params[] = &${"res_$i"};
+	}
+	$res = call_user_func_array(array($stmt, "bind_result"), $params);
+	unset($res, $params);
 	$stmt->fetch();

-
+

$stmt->close();

Do you need more help?

$mysql->query("DROP TABLE blobby");

-- 
MySQL Code Commits Mailing List
For list archives: 
Can we help you? 
In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software:Learn more about Pantek's Technical Support offerings
Place an order for 24/7/365 Technical Support here
Learn more about Pantek, who we are, and what we do
Chat with a Live Operator
Related lists.mysql.com Links
announce
benchmarks
bugs
certification
cluster
commits
dotnet
gui-tools
internals
java
maxdb
myodbc
mysql
mysqldoc
packagers
perl
plusplus
replication
win32
Request more information about Pantek
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com

Received on Wed Jul 11 17:23:39 2007

This message: [ Message body ]
Next message: U-ROWVWADEjas: "bk commit into 6.0-falcon tree (jas:1.2619)"
Previous message: konstantin(at)mysql.com: "bk commit into 5.0 tree (kostja:1.2517) BUG#25859"

Contemporary messages sorted: [ By Date ] [ By Thread ] [ By Subject ] [ By Author ] [ By messages with attachments ]

This archive was generated by hypermail 2.1.8 : Thu Aug 02 2007 - 01:54:34 EDT