From 725b31fc6cce293405d8c7875f2fdc657f9daccc Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Mon, 10 Mar 2008 20:15:38 +0000 Subject: 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 --- ext/mysql/php_mysql_structs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ext/mysql/php_mysql_structs.h') diff --git a/ext/mysql/php_mysql_structs.h b/ext/mysql/php_mysql_structs.h index 37436e6626..c353e88a25 100644 --- a/ext/mysql/php_mysql_structs.h +++ b/ext/mysql/php_mysql_structs.h @@ -35,14 +35,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 #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 @@ -114,7 +114,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; -- cgit v1.2.1