georg Thu Feb 26 03:27:26 2004 EDT
Modified files:
/php-src/ext/mysqli mysqli_fe.c mysqli_api.c mysqli_prop.c
Log:
removed blocking calls to mysql_set_server_option (MYSQLI_DISABLE_MQ)
added mysqli_multi_query to function table
changed stmt->affected_rows property (http://bugs.mysql.com/?id=2247) for 4.1.2
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_fe.c?r1=1.29&r2=1.30&ty=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.29 php-src/ext/mysqli/mysqli_fe.c:1.30
--- php-src/ext/mysqli/mysqli_fe.c:1.29 Sat Feb 21 02:37:41 2004
+++ php-src/ext/mysqli/mysqli_fe.c Thu Feb 26 03:27:24 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.29 2004/02/21 07:37:41 georg Exp $
+ $Id: mysqli_fe.c,v 1.30 2004/02/26 08:27:24 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -98,6 +98,7 @@
PHP_FE(mysqli_kill,
NULL)
PHP_FE(mysqli_master_query,
NULL)
PHP_FE(mysqli_more_results,
NULL)
+ PHP_FE(mysqli_multi_query,
NULL)
PHP_FE(mysqli_next_result,
NULL)
PHP_FE(mysqli_num_fields,
NULL)
PHP_FE(mysqli_num_rows,
NULL)
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_api.c?r1=1.74&r2=1.75&ty=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.74 php-src/ext/mysqli/mysqli_api.c:1.75
--- php-src/ext/mysqli/mysqli_api.c:1.74 Mon Feb 23 01:35:18 2004
+++ php-src/ext/mysqli/mysqli_api.c Thu Feb 26 03:27:24 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.74 2004/02/23 06:35:18 georg Exp $
+ $Id: mysqli_api.c,v 1.75 2004/02/26 08:27:24 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1656,13 +1656,11 @@
if (!(result = mysql_store_result(mysql))) {
MYSQLI_REPORT_MYSQL_ERROR(mysql);
- MYSQLI_DISABLE_MQ;
RETURN_FALSE;
}
if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
php_mysqli_report_index("from previous query", mysql->server_status
TSRMLS_CC);
}
- MYSQLI_DISABLE_MQ;
mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
mysqli_resource->ptr = (void *)result;
MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_result_class_entry);
@@ -1710,7 +1708,6 @@
if (!(result = mysql_use_result(mysql))) {
MYSQLI_REPORT_MYSQL_ERROR(mysql);
- MYSQLI_DISABLE_MQ;
RETURN_FALSE;
}
http://cvs.php.net/diff.php/php-src/ext/mysqli/mysqli_prop.c?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/mysqli/mysqli_prop.c
diff -u php-src/ext/mysqli/mysqli_prop.c:1.9 php-src/ext/mysqli/mysqli_prop.c:1.10
--- php-src/ext/mysqli/mysqli_prop.c:1.9 Fri Jan 30 17:45:19 2004
+++ php-src/ext/mysqli/mysqli_prop.c Thu Feb 26 03:27:24 2004
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_prop.c,v 1.9 2004/01/30 22:45:19 georg Exp $
+ $Id: mysqli_prop.c,v 1.10 2004/02/26 08:27:24 georg Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -177,7 +177,11 @@
/* statement properties */
+#if MYSQL_VERSION_ID < 40102
MYSQLI_MAP_PROPERTY_LONG_LONG(stmt_affected_rows_read, STMT,
stmt->mysql->last_used_con->affected_rows);
+#else
+MYSQLI_MAP_PROPERTY_LONG_LONG(stmt_affected_rows_read, STMT, stmt->affected_rows);
+#endif
MYSQLI_MAP_PROPERTY_LONG_LONG(stmt_num_rows_read, STMT, stmt->result->row_count);
MYSQLI_MAP_PROPERTY_STRING(stmt_query_read, STMT, stmt->query);
MYSQLI_MAP_PROPERTY_LONG(stmt_param_count_read, STMT, stmt->param_count);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
