diff options
| author | Sean Finney <seanius@debian.org> | 2010-02-07 22:19:53 +0100 |
|---|---|---|
| committer | Sean Finney <seanius@debian.org> | 2010-02-07 22:27:07 +0100 |
| commit | c852c28a88fccf6e34a2cb091fdfa72bce2b59c7 (patch) | |
| tree | 91f01b0d06916c78262404096bfd466b8e95e5b5 /ext/mysql/php_mysql_structs.h | |
| parent | 176cbd0bc99e20bb21f92f0b72df728eafc1e2ce (diff) | |
| parent | 0fab6db7cac8d2be99579dd049f812a8ff98e74f (diff) | |
| download | php-c852c28a88fccf6e34a2cb091fdfa72bce2b59c7.tar.gz | |
Merge branch 'upstream-experimental' into upstream-sid
Diffstat (limited to 'ext/mysql/php_mysql_structs.h')
| -rw-r--r-- | ext/mysql/php_mysql_structs.h | 51 |
1 files changed, 32 insertions, 19 deletions
diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index 7a842d122..d74eadc04 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -13,30 +13,45 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Author: Zeev Suraski <zeev@zend.com> | + | Andrey Hristov <andrey@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: php_mysql_structs.h 272374 2008-12-31 11:17:49Z sebastian $ */ +/* $Id: php_mysql_structs.h 272370 2008-12-31 11:15:49Z sebastian $ */ #ifndef PHP_MYSQL_STRUCTS_H #define PHP_MYSQL_STRUCTS_H -#ifdef PHP_WIN32 -#define PHP_MYSQL_API __declspec(dllexport) -#else -#define PHP_MYSQL_API +#ifdef ZTS +#include "TSRM.h" #endif -#if HAVE_MYSQL +#ifndef TRUE +#define TRUE 1 +#endif -#ifdef ZTS -#include "TSRM.h" +#ifndef FALSE +#define FALSE 0 #endif -extern zend_module_entry mysql_module_entry; +#if defined(MYSQL_USE_MYSQLND) +#include "ext/mysqlnd/mysqlnd.h" +#include "mysql_mysqlnd.h" +#else +#include <mysql.h> +#endif -#define mysql_module_ptr &mysql_module_entry +#ifdef PHP_MYSQL_UNIX_SOCK_ADDR +#ifdef MYSQL_UNIX_ADDR +#undef MYSQL_UNIX_ADDR +#endif +#define MYSQL_UNIX_ADDR PHP_MYSQL_UNIX_SOCK_ADDR +#endif + +#if (MYSQL_VERSION_ID >= 40113 && MYSQL_VERSION_ID < 50000) || MYSQL_VERSION_ID >= 50007 || defined(MYSQL_USE_MYSQLND) +#define MYSQL_HAS_SET_CHARSET +#endif PHP_MINIT_FUNCTION(mysql); PHP_RINIT_FUNCTION(mysql); @@ -91,7 +106,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 +#ifdef MYSQL_HAS_SET_CHARSET PHP_FUNCTION(mysql_set_charset); #endif @@ -108,6 +123,12 @@ ZEND_BEGIN_MODULE_GLOBALS(mysql) long connect_timeout; long result_allocated; long trace_mode; + long allow_local_infile; +#ifdef MYSQL_USE_MYSQLND + MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache; + MYSQLND_QCACHE *mysqlnd_qcache; + long cache_size; +#endif ZEND_END_MODULE_GLOBALS(mysql) #ifdef ZTS @@ -117,12 +138,4 @@ ZEND_END_MODULE_GLOBALS(mysql) #endif -#else - -#define mysql_module_ptr NULL - -#endif - -#define phpext_mysql_ptr mysql_module_ptr - #endif /* PHP_MYSQL_STRUCTS_H */ |