diff options
| author | Andrey Hristov <andrey@php.net> | 2009-12-09 16:57:03 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2009-12-09 16:57:03 +0000 |
| commit | 157f1bddf1ff32af77bb47188e7fcc7f9425fbf8 (patch) | |
| tree | b58ae49d0da20d89a881492446b5c41be335dac5 /ext/mysqli | |
| parent | 617398b51dfa02e9749c0158db150db2036cd817 (diff) | |
| download | php-git-157f1bddf1ff32af77bb47188e7fcc7f9425fbf8.tar.gz | |
Remove disabled code - threaded fetching. This can be implemented
on a upper level and by offloading it we reduce the complexity of
the core.
Diffstat (limited to 'ext/mysqli')
| -rw-r--r-- | ext/mysqli/mysqli.c | 8 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 16 | ||||
| -rw-r--r-- | ext/mysqli/php_mysqli_structs.h | 3 |
3 files changed, 1 insertions, 26 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 1b550cf283..2e681d6028 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -740,9 +740,6 @@ PHP_MINIT_FUNCTION(mysqli) /* for mysqli_query */ REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT", MYSQLI_STORE_RESULT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_USE_RESULT", MYSQLI_USE_RESULT, CONST_CS | CONST_PERSISTENT); -#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED) - REGISTER_LONG_CONSTANT("MYSQLI_BG_STORE_RESULT", MYSQLI_BG_STORE_RESULT, CONST_CS | CONST_PERSISTENT); -#endif #if defined (MYSQLI_USE_MYSQLND) REGISTER_LONG_CONSTANT("MYSQLI_ASYNC", MYSQLI_ASYNC, CONST_CS | CONST_PERSISTENT); #endif @@ -1099,11 +1096,6 @@ PHP_FUNCTION(mysqli_result_construct) case MYSQLI_USE_RESULT: result = mysql_use_result(mysql->mysql); break; -#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED) - case MYSQLI_BG_STORE_RESULT: - result = mysqli_bg_store_result(mysql->mysql); - break; -#endif default: php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for resultmode"); } diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 7400641110..18ae3ee3b5 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -530,11 +530,7 @@ PHP_FUNCTION(mysqli_query) php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty query"); RETURN_FALSE; } - if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_STORE_RESULT -#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED) - && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_BG_STORE_RESULT -#endif - ) { + if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_STORE_RESULT) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid value for resultmode"); RETURN_FALSE; } @@ -575,11 +571,6 @@ PHP_FUNCTION(mysqli_query) case MYSQLI_USE_RESULT: result = mysql_use_result(mysql->mysql); break; -#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED) - case MYSQLI_BG_STORE_RESULT: - result = mysqli_bg_store_result(mysql->mysql); - break; -#endif } if (!result) { php_mysqli_throw_sql_exception((char *)mysql_sqlstate(mysql->mysql), mysql_errno(mysql->mysql) TSRMLS_CC, @@ -813,11 +804,6 @@ PHP_FUNCTION(mysqli_reap_async_query) case MYSQLI_USE_RESULT: result = mysql_use_result(mysql->mysql); break; -#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED) - case MYSQLI_BG_STORE_RESULT: - result = mysqli_bg_store_result(mysql->mysql); - break; -#endif } if (!result) { diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h index 984dda87d8..1b7e75f1ec 100644 --- a/ext/mysqli/php_mysqli_structs.h +++ b/ext/mysqli/php_mysqli_structs.h @@ -319,9 +319,6 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry * TSRML #define MYSQLI_STORE_RESULT 0 #define MYSQLI_USE_RESULT 1 #ifdef MYSQLI_USE_MYSQLND -#ifdef MYSQLND_THREADED -#define MYSQLI_BG_STORE_RESULT 4 -#endif #define MYSQLI_ASYNC 8 #else /* libmysql */ |