diff options
| author | Georg Richter <georg@php.net> | 2006-03-24 09:32:24 +0000 |
|---|---|---|
| committer | Georg Richter <georg@php.net> | 2006-03-24 09:32:24 +0000 |
| commit | b3a437fcc4861d5c1139b73cff00319daecee908 (patch) | |
| tree | 2f1bffe30f4283a46eb1c25bc0880b85da19786c /ext/mysqli/mysqli_repl.c | |
| parent | 9e26f6c21392ecbf0989f04c71cfa492317a7589 (diff) | |
| download | php-git-b3a437fcc4861d5c1139b73cff00319daecee908.tar.gz | |
Fix for bug #36802 (server crashes with invalid/not opened connections)
Added status to mysqli_resource:
MYSQLI_STATUS_UNKNOWN
MYSQLI_STATUS_CLEARED (for future use)
MYSQLI_STATUS_INITIALIZED (after mysqli_init and mysqli_stmt_init)
MYSQLI_STATUS_VALID (for valid objects)
removed valid flag
changed MYSQLI_FETCH_RESOURCE
added last parameter __check which specifies the status
Diffstat (limited to 'ext/mysqli/mysqli_repl.c')
| -rw-r--r-- | ext/mysqli/mysqli_repl.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/ext/mysqli/mysqli_repl.c b/ext/mysqli/mysqli_repl.c index 1093ccfab8..b68c4509b0 100644 --- a/ext/mysqli/mysqli_repl.c +++ b/ext/mysqli/mysqli_repl.c @@ -39,7 +39,7 @@ PHP_FUNCTION(mysqli_disable_reads_from_master) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); mysql_disable_reads_from_master(mysql); RETURN_TRUE; } @@ -55,7 +55,7 @@ PHP_FUNCTION(mysqli_disable_rpl_parse) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); mysql_disable_rpl_parse(mysql); RETURN_TRUE; } @@ -71,7 +71,7 @@ PHP_FUNCTION(mysqli_enable_reads_from_master) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); mysql_enable_reads_from_master(mysql); RETURN_TRUE; @@ -88,7 +88,7 @@ PHP_FUNCTION(mysqli_enable_rpl_parse) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); mysql_enable_rpl_parse(mysql); RETURN_TRUE; @@ -106,7 +106,7 @@ PHP_FUNCTION(mysqli_master_query) { if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); if (mysql_master_query(mysql, query, query_len)) { RETURN_FALSE; @@ -125,7 +125,7 @@ PHP_FUNCTION(mysqli_rpl_parse_enabled) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); RETURN_LONG(mysql_rpl_parse_enabled(mysql)); } @@ -141,7 +141,7 @@ PHP_FUNCTION(mysqli_rpl_probe) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "O", &mysql_link, mysqli_link_class_entry) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); if (mysql_rpl_probe(mysql)) { @@ -163,7 +163,7 @@ PHP_FUNCTION(mysqli_rpl_query_type) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); RETURN_LONG(mysql_rpl_query_type(query, query_len)); } @@ -181,7 +181,7 @@ PHP_FUNCTION(mysqli_send_query) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); if (mysql_send_query(mysql, query, query_len)) { RETURN_FALSE; @@ -202,7 +202,7 @@ PHP_FUNCTION(mysqli_slave_query) if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", &mysql_link, mysqli_link_class_entry, &query, &query_len) == FAILURE) { return; } - MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link"); + MYSQLI_FETCH_RESOURCE(mysql, MYSQL *, &mysql_link, "mysqli_link", MYSQLI_STATUS_VALID); if (mysql_slave_query(mysql, query, query_len)) { RETURN_FALSE; |