summaryrefslogtreecommitdiff
path: root/ext/mysql/php_mysql.h
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysql/php_mysql.h')
-rw-r--r--ext/mysql/php_mysql.h28
1 files changed, 25 insertions, 3 deletions
diff --git a/ext/mysql/php_mysql.h b/ext/mysql/php_mysql.h
index a088208a4b..fe21af15c5 100644
--- a/ext/mysql/php_mysql.h
+++ b/ext/mysql/php_mysql.h
@@ -34,6 +34,25 @@
#include "TSRM.h"
#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
+#ifndef FALSE
+#define FALSE 0
+#endif
+
+#if defined(HAVE_MYSQLND)
+#include "ext/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 +110,6 @@ 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 +124,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