diff options
| author | Andrey Hristov <andrey@php.net> | 2008-03-10 20:27:15 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-03-10 20:27:15 +0000 |
| commit | 60869b3e8e9b5a5ad4cc65ba3e78cbe0b8f541e4 (patch) | |
| tree | 2ca44d004ecd9b57e44095a98689302991306000 /ext/mysql/php_mysql_structs.h | |
| parent | af5a93e552c1a9244e527a9fa55c4ad73dee999e (diff) | |
| download | php-git-60869b3e8e9b5a5ad4cc65ba3e78cbe0b8f541e4.tar.gz | |
Update mysqlnd, ext/mysql and ext/mysqli - now possible to compile with different
configurations one or the another extension to use libmysql or mysqlnd mixed in
one binary
Diffstat (limited to 'ext/mysql/php_mysql_structs.h')
| -rw-r--r-- | ext/mysql/php_mysql_structs.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index d27c960464..07dea020eb 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -36,14 +36,14 @@ #define FALSE 0 #endif -#if defined(HAVE_MYSQLND) +#if defined(MYSQL_USE_MYSQLND) #include "ext/mysqlnd/mysqlnd.h" -#include "ext/mysql/mysql_mysqlnd.h" +#include "mysql_mysqlnd.h" #else #include <mysql.h> #endif -#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || HAVE_MYSQLND +#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || MYSQL_USE_MYSQLND #define MYSQL_HAS_SET_CHARSET #endif @@ -120,7 +120,7 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql) long result_allocated; long trace_mode; long allow_local_infile; -#ifdef HAVE_MYSQLND +#ifdef MYSQL_USE_MYSQLND MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache; MYSQLND_QCACHE *mysqlnd_qcache; long cache_size; |