diff options
| author | Johannes Schlüter <johannes@php.net> | 2008-09-29 21:15:16 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2008-09-29 21:15:16 +0000 |
| commit | 983c7f16972bbb8a8d4c04a048363f529d884d94 (patch) | |
| tree | be76c64759f59eed262606baa243a0e66c875f24 | |
| parent | 00b84bb1fd26b3e958cd196ebaf5942a074c16f8 (diff) | |
| download | php-git-983c7f16972bbb8a8d4c04a048363f529d884d94.tar.gz | |
No mysqli stuff in ext/mysql
| -rw-r--r-- | ext/mysql/mysql_mysqlnd.h | 15 | ||||
| -rw-r--r-- | ext/mysql/php_mysql.c | 4 |
2 files changed, 4 insertions, 15 deletions
diff --git a/ext/mysql/mysql_mysqlnd.h b/ext/mysql/mysql_mysqlnd.h index cf74618a92..9b4de3d9f5 100644 --- a/ext/mysql/mysql_mysqlnd.h +++ b/ext/mysql/mysql_mysqlnd.h @@ -24,18 +24,7 @@ #include "ext/mysqlnd/mysqlnd_libmysql_compat.h" -/* Here comes non-libmysql API to have less ifdefs in mysqli*/ -#define MYSQLI_CLOSE_EXPLICIT MYSQLND_CLOSE_EXPLICIT -#define MYSQLI_CLOSE_IMPLICIT MYSQLND_CLOSE_IMPLICIT -#define MYSQLI_CLOSE_DISCONNECTED MYSQLND_CLOSE_DISCONNECTED - -#define mysqli_result_is_unbuffered(r) ((r)->unbuf) -#define mysqli_server_status(c) (c)->upsert_status.server_status -#define mysqli_stmt_warning_count(s) mysqlnd_stmt_warning_count((s)) -#define mysqli_stmt_server_status(s) (s)->upsert_status.server_status -#define mysqli_stmt_get_connection(s) (s)->conn -#define mysqli_close(c, how) mysqlnd_close((c), (how)) -#define mysqli_stmt_close(c, implicit) mysqlnd_stmt_close((c), (implicit)) -#define mysqli_free_result(r, implicit) mysqlnd_free_result((r), (implicit)) +/* Here comes non-libmysql API to have less ifdefs in mysql */ +#define mysql_result_is_unbuffered(r) ((r)->unbuf) #endif diff --git a/ext/mysql/php_mysql.c b/ext/mysql/php_mysql.c index 3f9a57e4b7..6a946a7a09 100644 --- a/ext/mysql/php_mysql.c +++ b/ext/mysql/php_mysql.c @@ -269,7 +269,7 @@ void timeout(int sig); \ mysql_result = (MYSQL_RES *) zend_list_find(mysql->active_result_id, &type); \ if (mysql_result && type==le_result) { \ - if (mysqli_result_is_unbuffered(mysql_result) && !mysql_eof(mysql_result)) { \ + if (mysql_result_is_unbuffered(mysql_result) && !mysql_eof(mysql_result)) { \ php_error_docref(NULL TSRMLS_CC, E_NOTICE, "Function called without first fetching all rows from a previous unbuffered query"); \ } \ zend_list_delete(mysql->active_result_id); \ @@ -915,7 +915,7 @@ static void php_mysql_do_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) efree(hashed_details); /* free mysql structure */ #ifdef MYSQL_USE_MYSQLND - mysqli_close(mysql->conn, MYSQLI_CLOSE_DISCONNECTED); + mysqlnd_close(mysql->conn, MYSQLND_CLOSE_DISCONNECTED); #endif efree(mysql); MYSQL_DO_CONNECT_RETURN_FALSE(); |