ZTS fixes

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index e5d4a06d1b2253869a648a2ae81b361c21352181..48dd6a37345d6222475aa8c0dd89eac5654b0407 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1381,7 +1381,7 @@ PHP_FUNCTION(mysqli_real_query)
 
        if (!mysql_field_count(mysql)) {
                if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
-                       php_mysqli_report_index(query, mysql->server_status);
+                       php_mysqli_report_index(query, mysql->server_status TSRMLS_CC);
                }
        }
 
@@ -1829,7 +1829,7 @@ PHP_FUNCTION(mysqli_store_result)
                RETURN_FALSE;
        }
        if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
-               php_mysqli_report_index("from previous mysql_real_connect", mysql->server_status);
+               php_mysqli_report_index("from previous mysql_real_connect", mysql->server_status TSRMLS_CC);
        }
        MYSQLI_DISABLE_MQ;
        mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));
@@ -1884,7 +1884,7 @@ PHP_FUNCTION(mysqli_use_result)
        }
 
        if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
-               php_mysqli_report_index("from previous mysql_real_connect", mysql->server_status);
+               php_mysqli_report_index("from previous mysql_real_connect", mysql->server_status TSRMLS_CC);
        }
 
        mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));

diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c
index e6f8d6f36479e1198aa8610d5399873153129d43..34bf3329532804cd3dbb6160e3471a709829fe64 100644 (file)
--- a/ext/mysqli/mysqli_nonapi.c
+++ b/ext/mysqli/mysqli_nonapi.c
@@ -230,7 +230,7 @@ PHP_FUNCTION(mysqli_query)
 
        if (!mysql_field_count(mysql)) {
                if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
-                       php_mysqli_report_index(query, mysql->server_status);
+                       php_mysqli_report_index(query, mysql->server_status TSRMLS_CC);
                }
                RETURN_TRUE;
        }
@@ -242,7 +242,7 @@ PHP_FUNCTION(mysqli_query)
        }
 
        if (MyG(report_mode) & MYSQLI_REPORT_INDEX) {
-               php_mysqli_report_index(query, mysql->server_status);
+               php_mysqli_report_index(query, mysql->server_status TSRMLS_CC);
        }
 
        mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));

diff --git a/ext/mysqli/mysqli_report.c b/ext/mysqli/mysqli_report.c
index 5e0b6d41dc68027d821e11b96c2ad55bbe6a982c..61f154678dfe95311d4c826ac6058651c018d5a8 100644 (file)
--- a/ext/mysqli/mysqli_report.c
+++ b/ext/mysqli/mysqli_report.c
@@ -52,13 +52,13 @@ PHP_FUNCTION(mysqli_report)
 /* }}} */
 
 /* {{{ void php_mysqli_report_error(char *sqlstate, int errorno, char *error) */ 
-void php_mysqli_report_error(char *sqlstate, int errorno, char *error) {
+void php_mysqli_report_error(char *sqlstate, int errorno, char *error TSRMLS_DC) {
        php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error (%s/%d): %s", sqlstate, errorno, error);
 }
 /* }}} */
 
 /* {{{ void php_mysqli_report_index() */ 
-void php_mysqli_report_index(char *query, unsigned int status) {
+void php_mysqli_report_index(char *query, unsigned int status TSRMLS_DC) {
        char index[15];
 
        if (status & SERVER_QUERY_NO_GOOD_INDEX_USED) {

diff --git a/ext/mysqli/php_mysqli.h b/ext/mysqli/php_mysqli.h
index 5e77893f08eb8d6b3ace3cad7e87df4f21191fd7..e4c1f01393cb4dedf646671adedca2cec19c2caa 100644 (file)
--- a/ext/mysqli/php_mysqli.h
+++ b/ext/mysqli/php_mysqli.h
@@ -106,8 +106,8 @@ extern mysqli_property_entry mysqli_stmt_property_entries[];
 extern void php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAMETERS, int override_flag, int into_object);
 extern void php_clear_stmt_bind(STMT *stmt);
 extern void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type);
-extern void php_mysqli_report_error(char *sqlstate, int errorno, char *error);
-extern void php_mysqli_report_index(char *query, unsigned int status);
+extern void php_mysqli_report_error(char *sqlstate, int errorno, char *error TSRMLS_DC);
+extern void php_mysqli_report_index(char *query, unsigned int status TSRMLS_DC);
 
 zend_class_entry *mysqli_link_class_entry;
 zend_class_entry *mysqli_stmt_class_entry;
@@ -230,12 +230,12 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML
 
 #define MYSQLI_REPORT_MYSQL_ERROR(mysql) \
 if ((MyG(report_mode) & MYSQLI_REPORT_ERROR) && mysql->net.last_errno) { \
-       php_mysqli_report_error(mysql->net.sqlstate, mysql->net.last_errno, mysql->net.last_error); \
+       php_mysqli_report_error(mysql->net.sqlstate, mysql->net.last_errno, mysql->net.last_error TSRMLS_CC); \
 }
 
 #define MYSQLI_REPORT_STMT_ERROR(stmt) \
 if ((MyG(report_mode) & MYSQLI_REPORT_ERROR) && stmt->last_errno) { \
-       php_mysqli_report_error(stmt->sqlstate, stmt->last_errno, stmt->last_error); \
+       php_mysqli_report_error(stmt->sqlstate, stmt->last_errno, stmt->last_error TSRMLS_CC); \
 }
 
 PHP_MYSQLI_API void mysqli_register_link(zval *return_value, void *link TSRMLS_DC);