helly Sat Dec 13 08:44:57 2003 EDT
Modified files:
/php-src/ext/mysqli mysqli_api.c mysqli_nonapi.c mysqli_report.c
php_mysqli.h
Log:
ZTS fixes
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.52 php-src/ext/mysqli/mysqli_api.c:1.53
--- php-src/ext/mysqli/mysqli_api.c:1.52 Fri Dec 12 19:28:20 2003
+++ php-src/ext/mysqli/mysqli_api.c Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.52 2003/12/13 00:28:20 georg Exp $
+ $Id: mysqli_api.c,v 1.53 2003/12/13 13:44:56 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -1381,7 +1381,7 @@
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 @@
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 @@
}
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));
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.22 php-src/ext/mysqli/mysqli_nonapi.c:1.23
--- php-src/ext/mysqli/mysqli_nonapi.c:1.22 Sat Dec 13 05:15:45 2003
+++ php-src/ext/mysqli/mysqli_nonapi.c Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.22 2003/12/13 10:15:45 georg Exp $
+ $Id: mysqli_nonapi.c,v 1.23 2003/12/13 13:44:56 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -230,7 +230,7 @@
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 @@
}
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));
Index: php-src/ext/mysqli/mysqli_report.c
diff -u php-src/ext/mysqli/mysqli_report.c:1.1 php-src/ext/mysqli/mysqli_report.c:1.2
--- php-src/ext/mysqli/mysqli_report.c:1.1 Fri Dec 12 19:28:20 2003
+++ php-src/ext/mysqli/mysqli_report.c Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: mysqli_report.c,v 1.1 2003/12/13 00:28:20 georg Exp $
+ $Id: mysqli_report.c,v 1.2 2003/12/13 13:44:56 helly Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -52,13 +52,13 @@
/* }}} */
/* {{{ 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) {
Index: php-src/ext/mysqli/php_mysqli.h
diff -u php-src/ext/mysqli/php_mysqli.h:1.25 php-src/ext/mysqli/php_mysqli.h:1.26
--- php-src/ext/mysqli/php_mysqli.h:1.25 Fri Dec 12 19:28:20 2003
+++ php-src/ext/mysqli/php_mysqli.h Sat Dec 13 08:44:56 2003
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli.h,v 1.25 2003/12/13 00:28:20 georg Exp $
+ $Id: php_mysqli.h,v 1.26 2003/12/13 13:44:56 helly Exp $
*/
/* A little hack to prevent build break, when mysql is used together with
@@ -106,8 +106,8 @@
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 @@
#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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
