andrey Mon Mar 10 20:27:16 2008 UTC
Modified files:
/php-src/ext/mysql config.m4 config.w32 php_mysql.c
php_mysql_structs.h
/php-src/ext/mysqli config.m4 config.w32 mysqli.c mysqli_api.c
mysqli_fe.c mysqli_nonapi.c mysqli_warning.c
php_mysqli_structs.h
/php-src/ext/mysqlnd config9.m4
Log:
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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.m4?r1=1.73&r2=1.74&diff_format=u
Index: php-src/ext/mysql/config.m4
diff -u php-src/ext/mysql/config.m4:1.73 php-src/ext/mysql/config.m4:1.74
--- php-src/ext/mysql/config.m4:1.73 Fri Jul 27 01:09:17 2007
+++ php-src/ext/mysql/config.m4 Mon Mar 10 20:27:15 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.73 2007/07/27 01:09:17 jani Exp $
+dnl $Id: config.m4,v 1.74 2008/03/10 20:27:15 andrey Exp $
dnl
AC_DEFUN([MYSQL_LIB_CHK], [
@@ -158,5 +158,6 @@
if test "$PHP_MYSQL" = "mysqlnd"; then
PHP_ADD_EXTENSION_DEP(mysql, mysqlnd)
+ AC_DEFINE([MYSQL_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
fi
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/config.w32?r1=1.6&r2=1.7&diff_format=u
Index: php-src/ext/mysql/config.w32
diff -u php-src/ext/mysql/config.w32:1.6 php-src/ext/mysql/config.w32:1.7
--- php-src/ext/mysql/config.w32:1.6 Mon Jan 28 22:54:21 2008
+++ php-src/ext/mysql/config.w32 Mon Mar 10 20:27:15 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.6 2008/01/28 22:54:21 andrey Exp $
+// $Id: config.w32,v 1.7 2008/03/10 20:27:15 andrey Exp $
// vim:ft=javascript
ARG_WITH("mysql", "MySQL support", "no");
@@ -14,7 +14,7 @@
WARNING("mysql not enabled; libraries and headers not
found");
}
} else {
- AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support
enabled');
+ AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQL native driver support
enabled');
ADD_EXTENSION_DEP('mysql', 'mysqlnd', true);
EXTENSION("mysql", "php_mysql.c");
AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql.c?r1=1.256&r2=1.257&diff_format=u
Index: php-src/ext/mysql/php_mysql.c
diff -u php-src/ext/mysql/php_mysql.c:1.256 php-src/ext/mysql/php_mysql.c:1.257
--- php-src/ext/mysql/php_mysql.c:1.256 Mon Mar 10 09:16:13 2008
+++ php-src/ext/mysql/php_mysql.c Mon Mar 10 20:27:15 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.256 2008/03/10 09:16:13 andrey Exp $ */
+/* $Id: php_mysql.c,v 1.257 2008/03/10 20:27:15 andrey Exp $ */
/* TODO:
*
@@ -72,7 +72,7 @@
#define SAFE_STRING(s) ((s)?(s):"")
-#if MYSQL_VERSION_ID > 32199 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 32199 || defined(MYSQL_USE_MYSQLND)
# define mysql_row_length_type unsigned long
# define HAVE_MYSQL_ERRNO
#else
@@ -82,7 +82,7 @@
# endif
#endif
-#if MYSQL_VERSION_ID >= 32032 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID >= 32032 || defined(MYSQL_USE_MYSQLND)
#define HAVE_GETINFO_FUNCS
#endif
@@ -118,7 +118,7 @@
int multi_query;
} php_mysql_conn;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
static MYSQLND_ZVAL_PCACHE *mysql_mysqlnd_zval_cache;
static MYSQLND_QCACHE *mysql_mysqlnd_qcache;
#endif
@@ -220,7 +220,7 @@
/* Dependancies */
static const zend_module_dep mysql_deps[] = {
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQL_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
{NULL, NULL, NULL}
@@ -259,7 +259,7 @@
#define CHECK_LINK(link) { if (link==-1) { php_error_docref(NULL TSRMLS_CC,
E_WARNING, "A link to the server could not be established"); RETURN_FALSE; } }
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQL_USE_MYSQLND)
#define PHPMY_UNBUFFERED_QUERY_CHECK() \
{\
if (mysql->active_result_id) { \
@@ -398,7 +398,7 @@
STD_PHP_INI_ENTRY("mysql.connect_timeout", "60",
PHP_INI_ALL, OnUpdateLong, connect_timeout,
zend_mysql_globals, mysql_globals)
STD_PHP_INI_BOOLEAN("mysql.trace_mode", "0",
PHP_INI_ALL, OnUpdateLong, trace_mode,
zend_mysql_globals, mysql_globals)
STD_PHP_INI_BOOLEAN("mysql.allow_local_infile", "1", PHP_INI_SYSTEM,
OnUpdateLong, allow_local_infile, zend_mysql_globals,
mysql_globals)
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
STD_PHP_INI_ENTRY("mysql.cache_size", "2000",
PHP_INI_SYSTEM, OnUpdateLong, cache_size,
zend_mysql_globals, mysql_globals)
#endif
PHP_INI_END()
@@ -419,7 +419,7 @@
mysql_globals->trace_mode = 0;
mysql_globals->allow_local_infile = 1;
mysql_globals->result_allocated = 0;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
mysql_globals->cache_size = 0;
mysql_globals->mysqlnd_thd_zval_cache = NULL;
#endif
@@ -446,7 +446,7 @@
REGISTER_LONG_CONSTANT("MYSQL_CLIENT_INTERACTIVE", CLIENT_INTERACTIVE,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQL_CLIENT_IGNORE_SPACE",
CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT);
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
#if MYSQL_VERSION_ID >= 40000
if (mysql_server_init(0, NULL, NULL)) {
return FAILURE;
@@ -465,7 +465,7 @@
*/
PHP_MSHUTDOWN_FUNCTION(mysql)
{
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
#if MYSQL_VERSION_ID >= 40000
#ifdef PHP_WIN32
unsigned long client_ver = mysql_get_client_version();
@@ -494,7 +494,7 @@
*/
PHP_RINIT_FUNCTION(mysql)
{
-#if !defined(HAVE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
+#if !defined(MYSQL_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
if (mysql_thread_init()) {
return FAILURE;
}
@@ -506,7 +506,7 @@
MySG(connect_errno) =0;
MySG(result_allocated) = 0;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
MySG(mysqlnd_thd_zval_cache) =
mysqlnd_palloc_rinit(mysql_mysqlnd_zval_cache);
#endif
@@ -518,7 +518,7 @@
*/
PHP_RSHUTDOWN_FUNCTION(mysql)
{
-#if !defined(HAVE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
+#if !defined(MYSQL_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
mysql_thread_end();
#endif
@@ -531,7 +531,7 @@
if (MySG(connect_error)!=NULL) {
efree(MySG(connect_error));
}
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
mysqlnd_palloc_rshutdown(MySG(mysqlnd_thd_zval_cache));
#endif
@@ -552,13 +552,13 @@
snprintf(buf, sizeof(buf), "%ld", MySG(num_links));
php_info_print_table_row(2, "Active Links", buf);
php_info_print_table_row(2, "Client API version",
mysql_get_client_info());
-#if !defined (PHP_WIN32) && !defined (NETWARE) && !defined(HAVE_MYSQLND)
+#if !defined (PHP_WIN32) && !defined (NETWARE) && !defined(MYSQL_USE_MYSQLND)
php_info_print_table_row(2, "MYSQL_MODULE_TYPE", PHP_MYSQL_TYPE);
php_info_print_table_row(2, "MYSQL_SOCKET", MYSQL_UNIX_ADDR);
php_info_print_table_row(2, "MYSQL_INCLUDE", PHP_MYSQL_INCLUDE);
php_info_print_table_row(2, "MYSQL_LIBS", PHP_MYSQL_LIBS);
#endif
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQL_USE_MYSQLND)
{
zval values;
@@ -590,7 +590,7 @@
MYSQL_DO_CONNECT_CLEANUP(); \
RETURN_FALSE;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
#define MYSQL_PORT 0
#endif
@@ -715,7 +715,7 @@
mysql = (php_mysql_conn *)
malloc(sizeof(php_mysql_conn));
mysql->active_result_id = 0;
mysql->multi_query = 1;
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
mysql->conn = mysql_init(NULL);
#else
mysql->conn = mysql_init(persistent);
@@ -726,7 +726,7 @@
if (connect_timeout != -1)
mysql_options(mysql->conn,
MYSQL_OPT_CONNECT_TIMEOUT, (const char *)&connect_timeout);
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd,
NULL, port, socket, client_flags)==NULL)
#else
if (mysqlnd_connect(mysql->conn, host, user, passwd, 0,
NULL, 0,
@@ -748,7 +748,7 @@
}
mysql_options(mysql->conn, MYSQL_OPT_LOCAL_INFILE,
(char *)&MySG(allow_local_infile));
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQL_USE_MYSQLND)
if (UG(unicode)) {
#ifdef MYSQL_HAS_SET_CHARSET
mysql_set_character_set(mysql->conn, "utf8");
@@ -784,7 +784,7 @@
if (UG(unicode)) {
mysql_options(mysql->conn,
MYSQL_SET_CHARSET_NAME, "utf8");
}
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn,
host, user, passwd, NULL, port, socket, client_flags)==NULL)
#else
if (mysqlnd_connect(mysql->conn, host,
user, passwd, 0, NULL, 0,
@@ -796,7 +796,7 @@
efree(hashed_details);
MYSQL_DO_CONNECT_RETURN_FALSE();
}
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQL_USE_MYSQLND)
if (UG(unicode)) {
#ifdef MYSQL_HAS_SET_CHARSET
mysql_set_character_set(mysql->conn, "utf8");
@@ -812,7 +812,7 @@
mysql_options(mysql->conn,
MYSQL_OPT_LOCAL_INFILE, (char *)&MySG(allow_local_infile));
}
} else {
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
mysqlnd_restart_psession(mysql->conn);
#endif
}
@@ -857,7 +857,7 @@
mysql = (php_mysql_conn *) emalloc(sizeof(php_mysql_conn));
mysql->active_result_id = 0;
mysql->multi_query = 1;
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
mysql->conn = mysql_init(NULL);
#else
mysql->conn = mysql_init(persistent);
@@ -870,7 +870,7 @@
mysql_options(mysql->conn, MYSQL_OPT_CONNECT_TIMEOUT,
(const char *)&connect_timeout);
}
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
if (mysql_real_connect(mysql->conn, host, user, passwd, NULL,
port, socket, client_flags)==NULL)
#else
if (mysqlnd_connect(mysql->conn, host, user, passwd, 0, NULL,
0,
@@ -888,14 +888,14 @@
#endif
efree(hashed_details);
/* free mysql structure */
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
mysqli_close(mysql->conn, MYSQLI_CLOSE_DISCONNECTED);
#endif
efree(mysql);
MYSQL_DO_CONNECT_RETURN_FALSE();
}
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQL_USE_MYSQLND)
if (UG(unicode)) {
#ifdef MYSQL_HAS_SET_CHARSET
mysql_set_character_set(mysql->conn, "utf8");
@@ -1188,7 +1188,7 @@
int id = -1;
php_mysql_conn *mysql;
char *stat;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
uint stat_len;
#endif
@@ -1203,7 +1203,7 @@
ZEND_FETCH_RESOURCE2(mysql, php_mysql_conn *, &mysql_link, id,
"MySQL-Link", le_link, le_plink);
PHPMY_UNBUFFERED_QUERY_CHECK();
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
if ((stat = (char *)mysql_stat(mysql->conn))) {
RETURN_UTF8_STRING(stat, ZSTR_DUPLICATE);
#else
@@ -1357,7 +1357,7 @@
PHPMY_UNBUFFERED_QUERY_CHECK();
MYSQL_DISABLE_MQ;
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
/* check explain */
if (MySG(trace_mode)) {
if (!strncasecmp("select", query, 6)){
@@ -1846,7 +1846,7 @@
{
zval **result, **row, **field=NULL;
MYSQL_RES *mysql_result;
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
MYSQL_ROW sql_row;
mysql_row_length_type *sql_row_lengths;
#endif
@@ -1926,7 +1926,7 @@
}
}
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
if ((sql_row=mysql_fetch_row(mysql_result))==NULL
|| (sql_row_lengths=mysql_fetch_lengths(mysql_result))==NULL) {
/* shouldn't happen? */
RETURN_FALSE;
@@ -1983,7 +1983,7 @@
#define MYSQL_BINARY_CHARSET_NR 63
-#if MYSQL_VERSION_ID > 50002 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 50002 || defined(MYSQL_USE_MYSQLND)
/* we have BIT */
#define IS_BINARY_DATA(f) (((f)->type == MYSQL_TYPE_TINY_BLOB || (f)->type ==
MYSQL_TYPE_BLOB || \
(f)->type == MYSQL_TYPE_MEDIUM_BLOB || (f)->type ==
MYSQL_TYPE_LONG_BLOB || \
@@ -2006,7 +2006,7 @@
MYSQL_RES *mysql_result;
zval *res, *ctor_params = NULL;
zend_class_entry *ce = NULL;
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
int i;
MYSQL_FIELD *mysql_field;
MYSQL_ROW mysql_row;
@@ -2065,7 +2065,7 @@
ZEND_FETCH_RESOURCE(mysql_result, MYSQL_RES *, result, -1, "MySQL
result", le_result);
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
if ((mysql_row = mysql_fetch_row(mysql_result)) == NULL ||
(mysql_row_lengths = mysql_fetch_lengths(mysql_result)) ==
NULL) {
RETURN_FALSE;
@@ -2206,7 +2206,7 @@
Gets a result row as an enumerated array */
PHP_FUNCTION(mysql_fetch_row)
{
-#ifdef HAVE_MYSQLND
+#ifdef MYSQL_USE_MYSQLND
MYSQL_RES *result;
zval *mysql_result;
@@ -2240,7 +2240,7 @@
Fetch a result row as an array (associative, numeric or both) */
PHP_FUNCTION(mysql_fetch_array)
{
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 2, 0);
#else
MYSQL_RES *result;
@@ -2262,7 +2262,7 @@
Fetch a result row as an associative array */
PHP_FUNCTION(mysql_fetch_assoc)
{
-#ifndef HAVE_MYSQLND
+#ifndef MYSQL_USE_MYSQLND
php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, MYSQL_ASSOC, 1,
0);
#else
MYSQL_RES *result;
@@ -2339,7 +2339,7 @@
case FIELD_TYPE_VAR_STRING:
return "string";
break;
-#if MYSQL_VERSION_ID > 50002 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 50002 || defined(MYSQL_USE_MYSQLND)
case MYSQL_TYPE_BIT:
#endif
#ifdef MYSQL_HAS_TINY
http://cvs.php.net/viewvc.cgi/php-src/ext/mysql/php_mysql_structs.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysql/php_mysql_structs.h
diff -u php-src/ext/mysql/php_mysql_structs.h:1.4
php-src/ext/mysql/php_mysql_structs.h:1.5
--- php-src/ext/mysql/php_mysql_structs.h:1.4 Mon Jan 28 11:16:37 2008
+++ php-src/ext/mysql/php_mysql_structs.h Mon Mar 10 20:27:15 2008
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql_structs.h,v 1.4 2008/01/28 11:16:37 nlopess Exp $ */
+/* $Id: php_mysql_structs.h,v 1.5 2008/03/10 20:27:15 andrey Exp $ */
#ifndef PHP_MYSQL_STRUCTS_H
#define 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 @@
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;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.m4?r1=1.30&r2=1.31&diff_format=u
Index: php-src/ext/mysqli/config.m4
diff -u php-src/ext/mysqli/config.m4:1.30 php-src/ext/mysqli/config.m4:1.31
--- php-src/ext/mysqli/config.m4:1.30 Fri Dec 28 15:38:23 2007
+++ php-src/ext/mysqli/config.m4 Mon Mar 10 20:27:15 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.30 2007/12/28 15:38:23 andrey Exp $
+dnl $Id: config.m4,v 1.31 2008/03/10 20:27:15 andrey Exp $
dnl config.m4 for extension mysqli
PHP_ARG_WITH(mysqli, for MySQLi support,
@@ -73,5 +73,6 @@
if test "$PHP_MYSQLI" = "mysqlnd"; then
PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd)
+ AC_DEFINE([MYSQLI_USE_MYSQLND], 1, [Whether mysqlnd is enabled])
fi
fi
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/config.w32?r1=1.11&r2=1.12&diff_format=u
Index: php-src/ext/mysqli/config.w32
diff -u php-src/ext/mysqli/config.w32:1.11 php-src/ext/mysqli/config.w32:1.12
--- php-src/ext/mysqli/config.w32:1.11 Fri Dec 28 15:38:23 2007
+++ php-src/ext/mysqli/config.w32 Mon Mar 10 20:27:15 2008
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.11 2007/12/28 15:38:23 andrey Exp $
+// $Id: config.w32,v 1.12 2008/03/10 20:27:15 andrey Exp $
// vim:ft=javascript
// Note: The extension name is "mysqli", you enable it with "--with-mysqli".
@@ -33,7 +33,7 @@
}
} else {
EXTENSION("mysqli", mysqli_source);
- AC_DEFINE('HAVE_MYSQLND', 1, 'MySQLi with native driver support
enabled');
+ AC_DEFINE('MYSQLI_USE_MYSQLND', 1, 'MySQLi with native driver
support enabled');
AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli.c?r1=1.126&r2=1.127&diff_format=u
Index: php-src/ext/mysqli/mysqli.c
diff -u php-src/ext/mysqli/mysqli.c:1.126 php-src/ext/mysqli/mysqli.c:1.127
--- php-src/ext/mysqli/mysqli.c:1.126 Mon Mar 10 13:38:23 2008
+++ php-src/ext/mysqli/mysqli.c Mon Mar 10 20:27:15 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli.c,v 1.126 2008/03/10 13:38:23 johannes Exp $
+ $Id: mysqli.c,v 1.127 2008/03/10 20:27:15 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -51,7 +51,7 @@
zend_class_entry *mysqli_warning_class_entry;
zend_class_entry *mysqli_exception_class_entry;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache;
MYSQLND_QCACHE *mysqli_mysqlnd_qcache;
#endif
@@ -73,7 +73,7 @@
void php_mysqli_dtor_p_elements(void *data)
{
MYSQL *mysql = (MYSQL *) data;
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
TSRMLS_FETCH();
mysqlnd_end_psession(mysql);
@@ -97,7 +97,7 @@
return le_pmysqli;
}
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
/* {{{ php_free_stmt_bind_buffer */
void php_free_stmt_bind_buffer(BIND_BUFFER bbuf, int type)
{
@@ -154,7 +154,7 @@
mysqlnd keeps track of the binding and has freed its
structures in stmt_close() above
*/
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
/* Clean param bind */
php_free_stmt_bind_buffer(stmt->param, FETCH_SIMPLE);
/* Clean output bind */
@@ -495,7 +495,7 @@
#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5
&& PHP_MINOR_VERSION >= 1))
ZEND_MOD_REQUIRED("spl")
#endif
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
ZEND_MOD_REQUIRED("mysqlnd")
#endif
{NULL, NULL, NULL}
@@ -543,7 +543,7 @@
STD_PHP_INI_ENTRY("mysqli.default_socket", NULL,
PHP_INI_ALL, OnUpdateStringUnempty, default_socket,
zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.reconnect", "0",
PHP_INI_SYSTEM, OnUpdateLong, reconnect,
zend_mysqli_globals, mysqli_globals)
STD_PHP_INI_BOOLEAN("mysqli.allow_local_infile", "1",
PHP_INI_SYSTEM, OnUpdateLong, allow_local_infile,
zend_mysqli_globals, mysqli_globals)
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
STD_PHP_INI_ENTRY("mysqli.cache_size", "2000",
PHP_INI_SYSTEM, OnUpdateLong, cache_size,
zend_mysqli_globals, mysqli_globals)
#endif
PHP_INI_END()
@@ -574,7 +574,7 @@
#else
mysqli_globals->embedded = 0;
#endif
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
mysqli_globals->cache_size = 0;
mysqli_globals->mysqlnd_thd_zval_cache = NULL;
#endif
@@ -590,7 +590,7 @@
REGISTER_INI_ENTRIES();
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
#if MYSQL_VERSION_ID >= 40000
if (mysql_server_init(0, NULL, NULL)) {
return FAILURE;
@@ -663,7 +663,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_OPT_CONNECT_TIMEOUT",
MYSQL_OPT_CONNECT_TIMEOUT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_OPT_LOCAL_INFILE",
MYSQL_OPT_LOCAL_INFILE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_INIT_COMMAND", MYSQL_INIT_COMMAND,
CONST_CS | CONST_PERSISTENT);
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_OPT_NUMERIC_AND_DATETIME_AS_UNICODE",
MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_CMD_BUFFER_SIZE",
MYSQLND_OPT_NET_CMD_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_OPT_NET_READ_BUFFER_SIZE",
MYSQLND_OPT_NET_READ_BUFFER_SIZE, CONST_CS | CONST_PERSISTENT);
@@ -683,7 +683,7 @@
/* for mysqli_query */
REGISTER_LONG_CONSTANT("MYSQLI_STORE_RESULT", MYSQLI_STORE_RESULT,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_USE_RESULT", MYSQLI_USE_RESULT, CONST_CS
| CONST_PERSISTENT);
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
+#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED)
REGISTER_LONG_CONSTANT("MYSQLI_BG_STORE_RESULT",
MYSQLI_BG_STORE_RESULT, CONST_CS | CONST_PERSISTENT);
#endif
@@ -695,7 +695,7 @@
/* for mysqli_stmt_set_attr */
REGISTER_LONG_CONSTANT("MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH",
STMT_ATTR_UPDATE_MAX_LENGTH, CONST_CS | CONST_PERSISTENT);
-#if MYSQL_VERSION_ID > 50003 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 50003 || defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_STMT_ATTR_CURSOR_TYPE",
STMT_ATTR_CURSOR_TYPE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_CURSOR_TYPE_NO_CURSOR",
CURSOR_TYPE_NO_CURSOR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_CURSOR_TYPE_READ_ONLY",
CURSOR_TYPE_READ_ONLY, CONST_CS | CONST_PERSISTENT);
@@ -703,7 +703,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_CURSOR_TYPE_SCROLLABLE",
CURSOR_TYPE_SCROLLABLE, CONST_CS | CONST_PERSISTENT);
#endif
-#if MYSQL_VERSION_ID > 50007 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 50007 || defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_STMT_ATTR_PREFETCH_ROWS",
STMT_ATTR_PREFETCH_ROWS, CONST_CS | CONST_PERSISTENT);
#endif
@@ -723,11 +723,11 @@
REGISTER_LONG_CONSTANT("MYSQLI_GROUP_FLAG", GROUP_FLAG, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_ENUM_FLAG", ENUM_FLAG, CONST_CS |
CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_BINARY_FLAG", BINARY_FLAG, CONST_CS |
CONST_PERSISTENT);
-#if MYSQL_VERSION_ID > 50001 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 50001 || defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_NO_DEFAULT_VALUE_FLAG",
NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
#endif
-#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 60000) ||
(MYSQL_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
+#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 60000) ||
(MYSQL_VERSION_ID > 60003) || defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_ON_UPDATE_NOW_FLAG", ON_UPDATE_NOW_FLAG,
CONST_CS | CONST_PERSISTENT);
#endif
@@ -758,7 +758,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_INTERVAL", FIELD_TYPE_INTERVAL,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_GEOMETRY", FIELD_TYPE_GEOMETRY,
CONST_CS | CONST_PERSISTENT);
-#if MYSQL_VERSION_ID > 50002 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 50002 || defined(MYSQLI_USE_MYSQLND)
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_NEWDECIMAL", FIELD_TYPE_NEWDECIMAL,
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("MYSQLI_TYPE_BIT", FIELD_TYPE_BIT, CONST_CS |
CONST_PERSISTENT);
#endif
@@ -779,7 +779,7 @@
REGISTER_LONG_CONSTANT("MYSQLI_REPORT_OFF", 0, CONST_CS |
CONST_PERSISTENT);
/* We use non-nested macros with expansion, as VC has problems */
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
REGISTER_LONG_CONSTANT("MYSQLI_DEBUG_TRACE_ENABLED",
MYSQLND_DBG_ENABLED, CONST_CS | CONST_PERSISTENT);
#else
#ifndef DBUG_OFF
@@ -797,7 +797,7 @@
*/
PHP_MSHUTDOWN_FUNCTION(mysqli)
{
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
#if MYSQL_VERSION_ID >= 40000
#ifdef PHP_WIN32
unsigned long client_ver = mysql_get_client_version();
@@ -833,14 +833,14 @@
*/
PHP_RINIT_FUNCTION(mysqli)
{
-#if !defined(HAVE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
+#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
if (mysql_thread_init()) {
return FAILURE;
}
#endif
MyG(error_msg) = NULL;
MyG(error_no) = 0;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
MyG(mysqlnd_thd_zval_cache) =
mysqlnd_palloc_rinit(mysqli_mysqlnd_zval_cache);
#endif
@@ -852,13 +852,13 @@
*/
PHP_RSHUTDOWN_FUNCTION(mysqli)
{
-#if !defined(HAVE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
+#if !defined(MYSQLI_USE_MYSQLND) && defined(ZTS) && MYSQL_VERSION_ID >= 40000
mysql_thread_end();
#endif
if (MyG(error_msg)) {
efree(MyG(error_msg));
}
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
mysqlnd_palloc_rshutdown(MyG(mysqlnd_thd_zval_cache));
#endif
return SUCCESS;
@@ -870,14 +870,14 @@
*/
PHP_MINFO_FUNCTION(mysqli)
{
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
char buf[32];
#endif
php_info_print_table_start();
php_info_print_table_header(2, "MysqlI Support", "enabled");
php_info_print_table_row(2, "Client API library version",
mysql_get_client_info());
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
php_info_print_table_row(2, "Client API header version",
MYSQL_SERVER_VERSION);
php_info_print_table_row(2, "MYSQLI_SOCKET", MYSQL_UNIX_ADDR);
#else
@@ -1000,7 +1000,7 @@
case MYSQLI_USE_RESULT:
result = mysql_use_result(mysql->mysql);
break;
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
+#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED)
case MYSQLI_BG_STORE_RESULT:
result = mysqli_bg_store_result(mysql->mysql);
break;
@@ -1038,7 +1038,7 @@
long fetchtype;
zval *ctor_params = NULL;
zend_class_entry *ce = NULL;
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
unsigned int i;
MYSQL_FIELD *fields;
MYSQL_ROW row;
@@ -1084,7 +1084,7 @@
RETURN_FALSE;
}
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
if (!(row = mysql_fetch_row(result))) {
RETURN_NULL();
}
@@ -1227,7 +1227,7 @@
}
/* }}} */
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
#define ALLOC_CALLBACK_ARGS(a, b, c)\
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_api.c?r1=1.159&r2=1.160&diff_format=u
Index: php-src/ext/mysqli/mysqli_api.c
diff -u php-src/ext/mysqli/mysqli_api.c:1.159
php-src/ext/mysqli/mysqli_api.c:1.160
--- php-src/ext/mysqli/mysqli_api.c:1.159 Sat Mar 8 15:16:08 2008
+++ php-src/ext/mysqli/mysqli_api.c Mon Mar 10 20:27:15 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_api.c,v 1.159 2008/03/08 15:16:08 andrey Exp $
+ $Id: mysqli_api.c,v 1.160 2008/03/10 20:27:15 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -76,7 +76,7 @@
/* }}} */
/* {{{ mysqli_stmt_bind_param_do_bind */
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
static
int mysqli_stmt_bind_param_do_bind(MY_STMT *stmt, unsigned int argc, unsigned
int num_vars,
zval
***args, unsigned int start, const char * const types TSRMLS_DC)
@@ -271,7 +271,7 @@
/* }}} */
/* {{{ mysqli_stmt_bind_result_do_bind */
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
/* TODO:
do_alloca, free_alloca
*/
@@ -345,7 +345,7 @@
break;
case MYSQL_TYPE_LONGLONG:
-#if MYSQL_VERSION_ID > 50002 || defined(HAVE_MYSQLND)
+#if MYSQL_VERSION_ID > 50002 || defined(MYSQLI_USE_MYSQLND)
case MYSQL_TYPE_BIT:
#endif
stmt->result.buf[ofs].type = IS_STRING;
@@ -704,7 +704,7 @@
{
MY_STMT *stmt;
zval *mysql_stmt;
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
unsigned int i;
#endif
@@ -713,7 +713,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt",
MYSQLI_STATUS_VALID);
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
for (i = 0; i < stmt->param.var_cnt; i++) {
if (stmt->param.vars[i]) {
if ( !(stmt->param.is_null[i] =
(stmt->param.vars[i]->type == IS_NULL)) ) {
@@ -758,7 +758,7 @@
php_mysqli_report_index(stmt->query,
mysqli_stmt_server_status(stmt->stmt) TSRMLS_CC);
}
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
/* free converted utf8 strings */
if (UG(unicode)) {
for (i = 0; i < stmt->param.var_cnt; i++) {
@@ -773,7 +773,7 @@
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
#define MYSQL_BINARY_CHARSET_NR 63
#if MYSQL_VERSION_ID > 50002
@@ -987,7 +987,7 @@
Fetch results from a prepared statement into the bound variables */
PHP_FUNCTION(mysqli_stmt_fetch)
{
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
mysqli_stmt_fetch_libmysql(INTERNAL_FUNCTION_PARAM_PASSTHRU);
#else
mysqli_stmt_fetch_mysqlnd(INTERNAL_FUNCTION_PARAM_PASSTHRU);
@@ -1127,7 +1127,7 @@
Get a result row as an enumerated array */
PHP_FUNCTION(mysqli_fetch_row)
{
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU,
MYSQLI_NUM, 0);
#else
MYSQL_RES *result;
@@ -1323,7 +1323,7 @@
MYSQLI_RESOURCE *mysqli_resource;
MY_MYSQL *mysql = (MY_MYSQL *)ecalloc(1, sizeof(MY_MYSQL));
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
if (!(mysql->mysql = mysql_init(NULL)))
#else
/*
@@ -1394,7 +1394,7 @@
/* {{{ proto void mysqli_set_local_infile_default(object link) U
unsets user defined handler for load local infile command */
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
PHP_FUNCTION(mysqli_set_local_infile_default)
{
MY_MYSQL *mysql;
@@ -1604,7 +1604,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
if (mysql->mysql->status == MYSQL_STATUS_GET_RESULT) {
php_error_docref(NULL TSRMLS_CC, E_WARNING, "All data must be
fetched before a new statement prepare takes place");
RETURN_FALSE;
@@ -1616,7 +1616,7 @@
if ((stmt->stmt = mysql_stmt_init(mysql->mysql))) {
if (mysql_stmt_prepare(stmt->stmt, query, query_len)) {
/* mysql_stmt_close() clears errors, so we have to
store them temporarily */
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
char last_error[MYSQL_ERRMSG_SIZE];
char sqlstate[SQLSTATE_LENGTH+1];
unsigned int last_errno;
@@ -1631,7 +1631,7 @@
stmt->stmt = NULL;
/* restore error messages */
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
mysql->mysql->net.last_errno = last_errno;
memcpy(mysql->mysql->net.last_error, last_error,
MYSQL_ERRMSG_SIZE);
memcpy(mysql->mysql->net.sqlstate, sqlstate,
SQLSTATE_LENGTH+1);
@@ -1982,7 +1982,7 @@
/* {{{ proto bool mysqli_ssl_set(object link ,string key ,string cert ,string
ca ,string capath ,string cipher]) U
*/
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
PHP_FUNCTION(mysqli_ssl_set)
{
MY_MYSQL *mysql;
@@ -2018,7 +2018,7 @@
MY_MYSQL *mysql;
zval *mysql_link;
char *stat;
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
uint stat_len;
#endif
@@ -2027,7 +2027,7 @@
}
MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL *, &mysql_link, "mysqli_link",
MYSQLI_STATUS_VALID);
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
if ((stat = (char *)mysql_stat(mysql->mysql)))
{
RETURN_UTF8_STRING(stat, ZSTR_DUPLICATE);
@@ -2078,7 +2078,7 @@
{
MY_STMT *stmt;
zval *mysql_stmt;
-#if !defined(HAVE_MYSQLND) && MYSQL_VERSION_ID > 50099
+#if !defined(MYSQLI_USE_MYSQLND) && MYSQL_VERSION_ID > 50099
my_bool value;
#else
ulong value = 0;
@@ -2223,7 +2223,7 @@
}
MYSQLI_FETCH_RESOURCE(stmt, MY_STMT *, &mysql_stmt, "mysqli_stmt",
MYSQLI_STATUS_VALID);
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
{
/*
If the user wants to store the data and we have BLOBs/TEXTs
we try to allocate
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_fe.c?r1=1.61&r2=1.62&diff_format=u
Index: php-src/ext/mysqli/mysqli_fe.c
diff -u php-src/ext/mysqli/mysqli_fe.c:1.61 php-src/ext/mysqli/mysqli_fe.c:1.62
--- php-src/ext/mysqli/mysqli_fe.c:1.61 Sat Mar 8 15:16:08 2008
+++ php-src/ext/mysqli/mysqli_fe.c Mon Mar 10 20:27:15 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_fe.c,v 1.61 2008/03/08 15:16:08 andrey Exp $
+ $Id: mysqli_fe.c,v 1.62 2008/03/10 20:27:15 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -77,7 +77,7 @@
PHP_FE(mysqli_fetch_fields,
NULL)
PHP_FE(mysqli_fetch_field_direct,
NULL)
PHP_FE(mysqli_fetch_lengths,
NULL)
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
PHP_FE(mysqli_fetch_all,
NULL)
#endif
PHP_FE(mysqli_fetch_array,
NULL)
@@ -88,7 +88,7 @@
PHP_FE(mysqli_field_seek,
NULL)
PHP_FE(mysqli_field_tell,
NULL)
PHP_FE(mysqli_free_result,
NULL)
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
PHP_FE(mysqli_get_cache_stats,
NULL)
PHP_FE(mysqli_get_connection_stats,
NULL)
PHP_FE(mysqli_get_client_stats,
NULL)
@@ -107,7 +107,7 @@
PHP_FE(mysqli_info,
NULL)
PHP_FE(mysqli_insert_id,
NULL)
PHP_FE(mysqli_kill,
NULL)
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
PHP_FE(mysqli_set_local_infile_default, NULL)
PHP_FE(mysqli_set_local_infile_handler, NULL)
#endif
@@ -140,7 +140,7 @@
PHP_FE(mysqli_stmt_bind_result,
second_arg_force_by_ref_rest)
PHP_FE(mysqli_stmt_fetch,
NULL)
PHP_FE(mysqli_stmt_free_result,
NULL)
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
PHP_FE(mysqli_stmt_get_result,
NULL)
#endif
PHP_FE(mysqli_stmt_get_warnings,
NULL)
@@ -148,7 +148,7 @@
PHP_FE(mysqli_stmt_reset,
NULL)
PHP_FE(mysqli_stmt_param_count,
NULL)
PHP_FE(mysqli_sqlstate,
NULL)
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
PHP_FE(mysqli_ssl_set,
NULL)
#endif
PHP_FE(mysqli_stat,
NULL)
@@ -199,14 +199,14 @@
PHP_FALIAS(get_charset,mysqli_get_charset,NULL)
#endif
PHP_FALIAS(get_client_info,mysqli_get_client_info,NULL)
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
PHP_FALIAS(get_connection_stats,mysqli_get_connection_stats,NULL)
#endif
PHP_FALIAS(get_server_info,mysqli_get_server_info,NULL)
PHP_FALIAS(get_warnings, mysqli_get_warnings, NULL)
PHP_FALIAS(init,mysqli_init,NULL)
PHP_FALIAS(kill,mysqli_kill,NULL)
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
PHP_FALIAS(set_local_infile_default,mysqli_set_local_infile_default,NULL)
PHP_FALIAS(set_local_infile_handler,mysqli_set_local_infile_handler,NULL)
#endif
@@ -228,7 +228,7 @@
PHP_FALIAS(set_charset,mysqli_set_charset,NULL)
#endif
PHP_FALIAS(set_opt, mysqli_options,NULL)
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
PHP_FALIAS(ssl_set,mysqli_ssl_set,NULL)
#endif
PHP_FALIAS(stat,mysqli_stat,NULL)
@@ -252,7 +252,7 @@
PHP_FALIAS(fetch_field,mysqli_fetch_field,NULL)
PHP_FALIAS(fetch_fields,mysqli_fetch_fields,NULL)
PHP_FALIAS(fetch_field_direct,mysqli_fetch_field_direct,NULL)
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
PHP_FALIAS(fetch_all,mysqli_fetch_all,NULL)
#endif
PHP_FALIAS(fetch_array,mysqli_fetch_array,NULL)
@@ -288,7 +288,7 @@
PHP_FALIAS(reset,mysqli_stmt_reset,NULL)
PHP_FALIAS(prepare,mysqli_stmt_prepare, NULL)
PHP_FALIAS(store_result,mysqli_stmt_store_result,NULL)
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
PHP_FALIAS(get_result,mysqli_stmt_get_result,NULL)
#endif
{NULL, NULL, NULL}
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_nonapi.c?r1=1.80&r2=1.81&diff_format=u
Index: php-src/ext/mysqli/mysqli_nonapi.c
diff -u php-src/ext/mysqli/mysqli_nonapi.c:1.80
php-src/ext/mysqli/mysqli_nonapi.c:1.81
--- php-src/ext/mysqli/mysqli_nonapi.c:1.80 Sat Mar 8 15:16:08 2008
+++ php-src/ext/mysqli/mysqli_nonapi.c Mon Mar 10 20:27:15 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_nonapi.c,v 1.80 2008/03/08 15:16:08 andrey Exp $
+ $Id: mysqli_nonapi.c,v 1.81 2008/03/10 20:27:15 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
@@ -151,13 +151,13 @@
#else
if
(!mysql_ping(mysql->mysql)) {
#endif
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
mysqlnd_restart_psession(mysql->mysql);
#endif
MyG(num_active_persistent)++;
goto end;
} else {
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
mysqlnd_end_psession(mysql->mysql);
#endif
mysqli_close(mysql->mysql, MYSQLI_CLOSE_IMPLICIT);
@@ -189,7 +189,7 @@
goto err;
}
if (!is_real_connect && !mysql->mysql) {
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
if (!(mysql->mysql = mysql_init(NULL))) {
#else
if (!(mysql->mysql = mysqlnd_init(persistent))) {
@@ -213,7 +213,7 @@
}
#endif
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
if (mysql_real_connect(mysql->mysql, hostname, username, passwd,
dbname, port, socket, CLIENT_MULTI_RESULTS) == NULL)
#else
if (mysqlnd_connect(mysql->mysql, hostname, username, passwd,
passwd_len, dbname, dbname_len,
@@ -239,7 +239,7 @@
/* clear error */
php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)
mysql_error(mysql->mysql) TSRMLS_CC);
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
mysql->mysql->reconnect = MyG(reconnect);
/* set our own local_infile handler */
@@ -262,7 +262,7 @@
MyG(num_links)++;
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
mysql->multi_query = 0;
#else
mysql->multi_query = 1;
@@ -334,7 +334,7 @@
Fetch a result row as an associative array, a numeric array, or both */
PHP_FUNCTION(mysqli_fetch_array)
{
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0, 0);
#else
MYSQL_RES *result;
@@ -360,7 +360,7 @@
Fetch a result row as an associative array */
PHP_FUNCTION(mysqli_fetch_assoc)
{
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
php_mysqli_fetch_into_hash(INTERNAL_FUNCTION_PARAM_PASSTHRU,
MYSQLI_ASSOC, 0);
#else
MYSQL_RES *result;
@@ -379,7 +379,7 @@
/* {{{ proto mixed mysqli_fetch_all (object result [,int resulttype]) U
Fetches all result rows as an associative array, a numeric array, or both */
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
PHP_FUNCTION(mysqli_fetch_all)
{
MYSQL_RES *result;
@@ -471,7 +471,7 @@
MYSQLI_ENABLE_MQ;
if (mysql_real_query(mysql->mysql, query, query_len)) {
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
char s_error[MYSQL_ERRMSG_SIZE], s_sqlstate[SQLSTATE_LENGTH+1];
unsigned int s_errno;
/* we have to save error information, cause
@@ -485,7 +485,7 @@
MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
MYSQLI_DISABLE_MQ;
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
/* restore error information */
strcpy(mysql->mysql->net.last_error, s_error);
strcpy(mysql->mysql->net.sqlstate, s_sqlstate);
@@ -520,7 +520,7 @@
RETURN_FALSE;
}
if (resultmode != MYSQLI_USE_RESULT && resultmode != MYSQLI_STORE_RESULT
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
+#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED)
&& resultmode != MYSQLI_BG_STORE_RESULT
#endif
) {
@@ -552,7 +552,7 @@
case MYSQLI_USE_RESULT:
result = mysql_use_result(mysql->mysql);
break;
-#if defined(HAVE_MYSQLND) && defined(MYSQLND_THREADED)
+#if defined(MYSQLI_USE_MYSQLND) && defined(MYSQLND_THREADED)
case MYSQLI_BG_STORE_RESULT:
result = mysqli_bg_store_result(mysql->mysql);
break;
@@ -576,7 +576,7 @@
/* }}} */
-#if defined(HAVE_MYSQLND)
+#if defined(MYSQLI_USE_MYSQLND)
/* {{{ proto object mysqli_stmt_get_result(object link) U
Buffer result set on client */
PHP_FUNCTION(mysqli_stmt_get_result)
@@ -695,7 +695,7 @@
zval *mysql_link;
char *name = NULL, *collation =
NULL, *dir = NULL;
uint minlength, maxlength, number,
state;
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
MY_CHARSET_INFO cs;
#else
const MYSQLND_CHARSET *cs;
@@ -708,7 +708,7 @@
object_init(return_value);
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
mysql_get_character_set_info(mysql->mysql, &cs);
name = (char *)cs.csname;
collation = (char *)cs.name;
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/mysqli_warning.c?r1=1.16&r2=1.17&diff_format=u
Index: php-src/ext/mysqli/mysqli_warning.c
diff -u php-src/ext/mysqli/mysqli_warning.c:1.16
php-src/ext/mysqli/mysqli_warning.c:1.17
--- php-src/ext/mysqli/mysqli_warning.c:1.16 Mon Dec 31 07:12:11 2007
+++ php-src/ext/mysqli/mysqli_warning.c Mon Mar 10 20:27:15 2008
@@ -17,7 +17,7 @@
| Ulf Wendel <[EMAIL PROTECTED]>
|
+----------------------------------------------------------------------+
- $Id: mysqli_warning.c,v 1.16 2007/12/31 07:12:11 sebastian Exp $
+ $Id: mysqli_warning.c,v 1.17 2008/03/10 20:27:15 andrey Exp $
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -47,7 +47,7 @@
/* }}} */
-#ifndef HAVE_MYSQLND
+#ifndef MYSQLI_USE_MYSQLND
/* {{{ MYSQLI_WARNING *php_new_warning */
static
MYSQLI_WARNING *php_new_warning(const char *reason, int errorno TSRMLS_DC)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqli/php_mysqli_structs.h?r1=1.13&r2=1.14&diff_format=u
Index: php-src/ext/mysqli/php_mysqli_structs.h
diff -u php-src/ext/mysqli/php_mysqli_structs.h:1.13
php-src/ext/mysqli/php_mysqli_structs.h:1.14
--- php-src/ext/mysqli/php_mysqli_structs.h:1.13 Mon Mar 10 09:16:13 2008
+++ php-src/ext/mysqli/php_mysqli_structs.h Mon Mar 10 20:27:15 2008
@@ -15,7 +15,7 @@
| Author: Georg Richter <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
- $Id: php_mysqli_structs.h,v 1.13 2008/03/10 09:16:13 andrey Exp $
+ $Id: php_mysqli_structs.h,v 1.14 2008/03/10 20:27:15 andrey Exp $
*/
#ifndef PHP_MYSQLI_STRUCTS_H
@@ -36,7 +36,7 @@
#define FALSE 0
#endif
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
#include "ext/mysqlnd/mysqlnd.h"
#include "mysqli_mysqlnd.h"
#else
@@ -139,7 +139,7 @@
int (*w_func)(mysqli_object *obj, zval *value TSRMLS_DC);
} mysqli_property_entry;
-#if !defined(HAVE_MYSQLND)
+#if !defined(MYSQLI_USE_MYSQLND)
typedef struct {
char error_msg[LOCAL_INFILE_ERROR_LEN];
void *userdata;
@@ -188,7 +188,7 @@
extern const mysqli_property_entry mysqli_driver_property_entries[];
extern const mysqli_property_entry mysqli_warning_property_entries[];
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
extern MYSQLND_ZVAL_PCACHE *mysqli_mysqlnd_zval_cache;
extern MYSQLND_QCACHE *mysqli_mysqlnd_qcache;
#endif
@@ -315,7 +315,7 @@
#define MYSQLI_STORE_RESULT 0
#define MYSQLI_USE_RESULT 1
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
#ifdef MYSQLND_THREADED
#define MYSQLI_BG_STORE_RESULT 101
#endif
@@ -385,7 +385,7 @@
HashTable *report_ht;
unsigned long multi_query;
unsigned long embedded;
-#ifdef HAVE_MYSQLND
+#ifdef MYSQLI_USE_MYSQLND
MYSQLND_THD_ZVAL_PCACHE *mysqlnd_thd_zval_cache;
#endif
ZEND_END_MODULE_GLOBALS(mysqli)
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config9.m4?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqlnd/config9.m4
diff -u php-src/ext/mysqlnd/config9.m4:1.7 php-src/ext/mysqlnd/config9.m4:1.8
--- php-src/ext/mysqlnd/config9.m4:1.7 Tue Jan 29 18:13:12 2008
+++ php-src/ext/mysqlnd/config9.m4 Mon Mar 10 20:27:15 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config9.m4,v 1.7 2008/01/29 18:13:12 andrey Exp $
+dnl $Id: config9.m4,v 1.8 2008/03/10 20:27:15 andrey Exp $
dnl config.m4 for mysqlnd driver
@@ -19,7 +19,6 @@
PHP_ADD_BUILD_DIR([ext/mysqlnd], 1)
PHP_INSTALL_HEADERS([ext/mysqlnd])
PHP_INSTALL_HEADERS([$ext_builddir/php_mysqlnd_config.h])
- AC_DEFINE([HAVE_MYSQLND], 1, [Whether mysqlnd is enabled])
dnl Windows uses config.w32 thus this code is safe for now
if test "$PHP_MYSQLND_THREADING" = "yes"; then
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
