archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ZTS fixes

Browse source
This commit is contained in:
Marcus Boerger 2003-12-13 13:44:56 +00:00
parent 32f41d172d
commit 04d0d99b11
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/mysqli/mysqli_api.c
View file

@ -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));

4
ext/mysqli/mysqli_nonapi.c
View file

@ -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));

4
ext/mysqli/mysqli_report.c
View file

@ -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) {

8
ext/mysqli/php_mysqli.h
View file

@ -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);