diff options
| author | Georg Richter <georg@php.net> | 2004-02-26 08:27:24 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2004-02-26 08:27:24 +0000 |
| commit | 5ffccfffdaefd76706df6d9776e195880b65d7a4 (patch) | |
| tree | 6bad7f7a244905fe8c78ff62075bb30b8e689790 | |
| parent | 1085c6c7f1da7b23821184ba2a0f35043bfd0f2b (diff) | |
| download | php-git-5ffccfffdaefd76706df6d9776e195880b65d7a4.tar.gz | |
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
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 3 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_fe.c | 1 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_prop.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index f2aef1f786..69bb79a7a5 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1656,13 +1656,11 @@ PHP_FUNCTION(mysqli_store_result) 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 @@ PHP_FUNCTION(mysqli_use_result) if (!(result = mysql_use_result(mysql))) { MYSQLI_REPORT_MYSQL_ERROR(mysql); - MYSQLI_DISABLE_MQ; RETURN_FALSE; } diff --git a/ext/mysqli/mysqli_fe.c b/ext/mysqli/mysqli_fe.c index b607cafb92..7ae2d161fb 100644 --- a/ext/mysqli/mysqli_fe.c +++ b/ext/mysqli/mysqli_fe.c @@ -98,6 +98,7 @@ function_entry mysqli_functions[] = { 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) diff --git a/ext/mysqli/mysqli_prop.c b/ext/mysqli/mysqli_prop.c index 80fe16a9fe..8e134183d3 100644 --- a/ext/mysqli/mysqli_prop.c +++ b/ext/mysqli/mysqli_prop.c @@ -177,7 +177,11 @@ MYSQLI_MAP_PROPERTY_LONG_LONG(result_num_rows_read, MYSQL_RES, row_count); /* 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); |