diff options
| author | Andrey Hristov <andrey@php.net> | 2007-07-24 16:13:26 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2007-07-24 16:13:26 +0000 |
| commit | 222174e23fe2e5583ecf9bf3f002190fd5b19120 (patch) | |
| tree | e3f84d2b146f50276444987c08d2ef6fa163f770 /ext/mysql/php_mysql.h | |
| parent | 9343c54040883483b20824ad50252e64b348a1cd (diff) | |
| download | php-git-222174e23fe2e5583ecf9bf3f002190fd5b19120.tar.gz | |
Import of mysqlnd and ext/mysql + ext/mysqli patched to be built either
with libmysql or mysqld.
Use --with-mysql=mysqlnd --with-mysqli=mysqlnd to build with mysqlnd.
Diffstat (limited to 'ext/mysql/php_mysql.h')
| -rw-r--r-- | ext/mysql/php_mysql.h | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h index a088208a4b..5f1123474f 100644 --- a/ext/mysql/php_mysql.h +++ b/ext/mysql/php_mysql.h @@ -34,6 +34,29 @@ #include "TSRM.h" #endif +#ifndef TRUE +#define TRUE 1 +#endif + +#ifndef FALSE +#define FALSE 0 +#endif + +#ifdef PHP_ATOM_INC +#include "ext/mysql/php_have_mysqlnd.h" /* HAVE_MYSQLND is defined here if enabled */ +#endif + +#if defined(HAVE_MYSQLND) +#include "ext/mysqli/mysqlnd/mysqlnd.h" +#include "ext/mysql/mysql_mysqlnd.h" +#else +#include <mysql.h> +#endif + +#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || HAVE_MYSQLND +#define MYSQL_HAS_SET_CHARSET +#endif + extern zend_module_entry mysql_module_entry; #define mysql_module_ptr &mysql_module_entry @@ -91,9 +114,7 @@ PHP_FUNCTION(mysql_stat); PHP_FUNCTION(mysql_thread_id); PHP_FUNCTION(mysql_client_encoding); PHP_FUNCTION(mysql_ping); -#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 PHP_FUNCTION(mysql_set_charset); -#endif ZEND_BEGIN_MODULE_GLOBALS(mysql) long default_link; @@ -108,6 +129,12 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql) long connect_timeout; long result_allocated; long trace_mode; + long allow_local_infile; +#ifdef HAVE_MYSQLND + MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache; + MYSQLND_QCACHE *mysqlnd_qcache; + long cache_size; +#endif ZEND_END_MODULE_GLOBALS(mysql) #ifdef ZTS @@ -125,4 +152,8 @@ ZEND_END_MODULE_GLOBALS(mysql) #define phpext_mysql_ptr mysql_module_ptr + +#include "ext/mysqli/mysqlnd/php_mysqlnd.h" + + #endif /* PHP_MYSQL_H */ |