Pantek Library
Hosting Provided By
CybrHost
High Speed Hosting
Mailing Lists: lists.mysql.com > commits > 07 > 072263.html (Request Expert lists.mysql.com Support)

PHP mysqlnd svn commit: r843 - in trunk: mysqlnd php5/ext/mysql php5/ext/mysqli php6/ext/mysql php6/ext/mysqli

From: <ahristov(at)mysql.com>
Date: Thu Jul 26 2007 - 15:28:07 EDT


Author: ahristov
Date: 2007-07-26 21:28:06 +0200 (Thu, 26 Jul 2007) New Revision: 843

Added:

   trunk/php5/ext/mysqli/config.m4
   trunk/php6/ext/mysqli/config.m4
Removed: 

   trunk/php5/ext/mysqli/config9.m4
   trunk/php5/ext/mysqli/mysqlnd
   trunk/php6/ext/mysqli/config9.m4
   trunk/php6/ext/mysqli/mysqlnd

Modified: 
   trunk/mysqlnd/config9.m4
   trunk/php5/ext/mysql/config.m4
   trunk/php5/ext/mysql/config.w32
   trunk/php5/ext/mysql/mysql_mysqlnd.h
   trunk/php5/ext/mysql/php_mysql.h
   trunk/php5/ext/mysqli/config.w32
   trunk/php5/ext/mysqli/mysqli_mysqlnd.h
   trunk/php5/ext/mysqli/php_mysqli.h
   trunk/php5/ext/mysqli/php_mysqli_structs.h
   trunk/php6/ext/mysql/config.m4
   trunk/php6/ext/mysql/config.w32
   trunk/php6/ext/mysql/mysql_mysqlnd.h
   trunk/php6/ext/mysql/package.xml
   trunk/php6/ext/mysql/php_mysql.h
   trunk/php6/ext/mysqli/config.w32
   trunk/php6/ext/mysqli/mysqli_mysqlnd.h
   trunk/php6/ext/mysqli/php_mysqli.h
   trunk/php6/ext/mysqli/php_mysqli_structs.h
Log:
Updates from CVS. PHP6 will compile, PHP5 will fail during configure. Jani will fix latest 5_2 and then we will be able to compile.

Modified: trunk/mysqlnd/config9.m4

  • trunk/mysqlnd/config9.m4 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/mysqlnd/config9.m4 2007-07-26 19:28:06 UTC (rev 843) @@ -1,5 +1,5 @@ dnl
    -dnl $Id: config9.m4,v 1.1 2007/07/25 23:47:32 jani Exp $
    +dnl $Id: config9.m4,v 1.2 2007/07/26 14:54:49 jani Exp $ dnl config.m4 for mysqlnd driver

 dnl If some extension uses mysqlnd it will get compiled in PHP core @@ -16,7 +16,7 @@

   AC_DEFINE([HAVE_MYSQLND], 1, [Whether mysqlnd is enabled])  

   dnl This creates a file so it has to be after above macros
- PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [
+ PHP_CHECK_TYPES([int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t], [

     $ext_builddir/php_mysqlnd_config.h
   ],[
 #ifdef HAVE_SYS_TYPES_H

Do you need help?X

Modified: trunk/php5/ext/mysql/config.m4

  • trunk/php5/ext/mysql/config.m4 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysql/config.m4 2007-07-26 19:28:06 UTC (rev 843) @@ -1,5 +1,5 @@ dnl
    -dnl $Id: config.m4,v 1.67.2.1.2.1 2006/06/01 19:14:48 mike Exp $
    +dnl $Id: config.m4,v 1.70 2007/07/25 23:47:32 jani Exp $ dnl

 AC_DEFUN([MYSQL_LIB_CHK], [
@@ -140,7 +140,6 @@

   PHP_ADD_LIBRARY_WITH_PATH($MYSQL_LIBNAME, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)    PHP_ADD_INCLUDE($MYSQL_INC_DIR)  
-

   MYSQL_MODULE_TYPE=external
   MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
   MYSQL_INCLUDE=-I$MYSQL_INC_DIR

@@ -156,9 +155,7 @@

   PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)    PHP_SUBST(MYSQL_SHARED_LIBADD)  

  • dnl These 3 lines are neeeded to be able to build ext/mysql and/or ext/mysqli with/without mysqlnd.
  • dnl Need to do this here for the file to be always available.
  • $php_shtool mkdir -p ext/mysql/
  • echo > ext/mysql/php_have_mysqlnd.h
  • test "$PHP_MYSQL" = "mysqlnd" && PHP_DEFINE(HAVE_MYSQLND, 1, [ext/mysql]) + if test "$PHP_MYSQLI" = "mysqlnd"; then + PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd) + fi fi

Modified: trunk/php5/ext/mysql/config.w32

  • trunk/php5/ext/mysql/config.w32 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysql/config.w32 2007-07-26 19:28:06 UTC (rev 843) @@ -1,15 +1,19 @@
    -// $Id: config.w32,v 1.2 2005/06/05 19:25:00 wez Exp $
    +// $Id: config.w32,v 1.3 2007/07/25 23:47:32 jani Exp $ // vim:ft=javascript

 ARG_WITH("mysql", "MySQL support", "no");  

 if (PHP_MYSQL != "no") {
- if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&

  • CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
  • PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
  • EXTENSION("mysql", "php_mysql.c");
  • AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
  • } else {
  • WARNING("mysql not enabled; libraries and headers not found");
  • } + if (PHP_MYSQLI != "mysqlnd") { + if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", + PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { + } else { + WARNING("mysql not enabled; libraries and headers not found"); + } + } else { + ADD_EXTENSION_DEP('mysql', 'mysqlnd', true); + } + EXTENSION("mysql", "php_mysql.c"); + AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); }

Modified: trunk/php5/ext/mysql/mysql_mysqlnd.h

  • trunk/php5/ext/mysql/mysql_mysqlnd.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysql/mysql_mysqlnd.h 2007-07-26 19:28:06 UTC (rev 843) @@ -22,7 +22,7 @@ #ifndef MYSQL_MYSQLND_H #define MYSQL_MYSQLND_H
Do you need more help?X

-#include "ext/mysqli/mysqlnd/mysqlnd_libmysql_compat.h"
+#include "ext/mysqlnd/mysqlnd_libmysql_compat.h"  

 /* Here comes non-libmysql API to have less ifdefs in mysqli*/ 

 #define MYSQLI_CLOSE_EXPLICIT                  MYSQLND_CLOSE_EXPLICIT

Modified: trunk/php5/ext/mysql/php_mysql.h

  • trunk/php5/ext/mysql/php_mysql.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysql/php_mysql.h 2007-07-26 19:28:06 UTC (rev 843) @@ -42,12 +42,8 @@ #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/mysqlnd/mysqlnd.h"
 #include "ext/mysql/mysql_mysqlnd.h"
 #else
 #include 
@@ -151,6 +147,4 @@

 #define phpext_mysql_ptr mysql_module_ptr  

-#include "ext/mysqli/mysqlnd/php_mysqlnd.h"
-

 #endif /* PHP_MYSQL_H */

Added: trunk/php5/ext/mysqli/config.m4

  • trunk/php5/ext/mysqli/config.m4 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysqli/config.m4 2007-07-26 19:28:06 UTC (rev 843) @@ -0,0 +1,77 @@ +dnl +dnl $Id: config.m4,v 1.28 2007/07/25 23:47:32 jani Exp $ +dnl config.m4 for extension mysqli + +PHP_ARG_WITH(mysqli, for MySQLi support, +[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname to mysql_config [mysql_config]. + If mysqlnd is passed as FILE, the MySQL native driver will be used]) + +PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, +[ --enable-embedded-mysqli MYSQLi: Enable embedded support], no, no) + +if test "$PHP_MYSQLI" = "mysqlnd"; then + dnl This needs to be set in any extension which wishes to use mysqlnd + PHP_MYSQLND_ENABLED=yes + +elif test "$PHP_MYSQLI" != "no"; then + + if test "$PHP_MYSQLI" = "yes"; then + MYSQL_CONFIG=`$php_shtool path mysql_config` + else + MYSQL_CONFIG=$PHP_MYSQLI + fi + + MYSQL_LIB_NAME='mysqlclient' + if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then + AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled]) + MYSQL_LIB_CFG='--libmysqld-libs' + dnl mysqlnd doesn't support embedded, so we have to add some extra stuff + mysqli_extra_sources="mysqli_embedded.c" + elif test "$enable_maintainer_zts" = "yes"; then + MYSQL_LIB_CFG='--libs_r' + MYSQL_LIB_NAME='mysqlclient_r' + else + MYSQL_LIB_CFG='--libs' + fi + + if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then + MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"` + MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"` + else + AC_MSG_RESULT([mysql_config not found]) + AC_MSG_ERROR([Please reinstall the mysql distribution]) + fi + + dnl + dnl Check the library + dnl + PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_server_option, + [ + PHP_EVAL_INCLINE($MYSQLI_INCLINE) + PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD) + AC_DEFINE(HAVE_MYSQLILIB, 1, [ ]) + PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_character_set, + [ ],[ + AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries.]) + ],[$MYSQLI_LIBLINE]) + ],[ + AC_MSG_ERROR([wrong mysql library version or lib not found. Check config.log for more information.]) + ],[ + $MYSQLI_LIBLINE + ]) + + mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c" +fi + +dnl Build extension +if test "$PHP_MYSQLI" != "no"; then + mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \ + mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \ + mysqli_exception.c $mysqli_extra_sources" + PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared) + PHP_SUBST(MYSQLI_SHARED_LIBADD) + + if test "$PHP_MYSQLI" = "mysqlnd"; then + PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd) + fi +fi

Modified: trunk/php5/ext/mysqli/config.w32

  • trunk/php5/ext/mysqli/config.w32 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysqli/config.w32 2007-07-26 19:28:06 UTC (rev 843) @@ -2,12 +2,11 @@ // vim:ft=javascript 
 // Note: The extension name is "mysqli", you enable it with "--with-mysqli".

-// The "--enable-mysqlnd" tells to use "mysqli", if enabled, with the bundled

+// Passing value "mysqlnd" to it enables the bundled
 // client library to connect to the MySQL server, i.e. no external MySQL
 // client library is needed to perform the build.
Can we help you?X

 ARG_WITH("mysqli", "MySQLi support", "no");
-ARG_ENABLE("mysqlnd", "MySQLi with mysqlnd support", "no");
 

 if (PHP_MYSQLI != "no") {  

@@ -23,7 +22,7 @@ 

         "mysqli_report.c " +
         "mysqli_warning.c";
  • if (PHP_MYSQLND == "no") { + if (PHP_MYSQLI != "mysqlnd") { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + @@ -38,27 +37,8 @@

   } else {  

  • mysqlnd_source =
  • "mysqlnd.c " +
    -// "mysqlnd_alloc.c " +
  • "mysqlnd_charset.c " +
  • "mysqlnd_loaddata.c " +
  • "mysqlnd_palloc.c " +
  • "mysqlnd_ps.c " +
  • "mysqlnd_ps_codec.c " +
  • "mysqlnd_qcache.c " +
  • "mysqlnd_result.c " +
  • "mysqlnd_result_meta.c " +
  • "mysqlnd_statistics.c " +
  • "mysqlnd_wireprotocol.c";
    -
    EXTENSION("mysqli", mysqli_source);
  • // Specify that add "mysqlnd" sources, but use same object file
  • // directory as the "mysqli" sources
  • // FIXME the hard coded "ext/mysqli/mysqlnd" prevents pointing
  • // out sources in another directory? Like above: PHP_MYSQLI + "\\include;"
  • ADD_SOURCES("ext/mysqli/mysqlnd", mysqlnd_source, "mysqli"); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
  • AC_DEFINE('HAVE_MYSQLND' , 1, 'MySQL native driver support enabled'); + ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); } }

Deleted: trunk/php5/ext/mysqli/config9.m4

  • trunk/php5/ext/mysqli/config9.m4 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysqli/config9.m4 2007-07-26 19:28:06 UTC (rev 843) @@ -1,120 +0,0 @@
    -dnl
    -dnl $Id: config.m4,v 1.25 2006/10/09 04:46:03 georg Exp $
    -dnl config.m4 for extension mysqli
    -
    -
    -PHP_ARG_WITH(mysqli, for MySQLi support,
    -[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname to mysql_config [mysql_config].
    • If mysqlnd is passed as FILE, the MySQL native driver will be used])
      -
      -PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
      -[ --enable-embedded-mysqli MYSQLi: Enable embedded support], no, no)
      -
      -if test "$PHP_MYSQLI" = "mysqlnd"; then
    • dnl This needs to be set in any extension which wishes to use mysqlnd
    • PHP_MYSQLND_ENABLED=yes
      -
      -elif test "$PHP_MYSQLI" != "no"; then
      -
    • if test "$PHP_MYSQLI" = "yes"; then
    • MYSQL_CONFIG=`$php_shtool path mysql_config`
    • else
    • MYSQL_CONFIG=$PHP_MYSQLI
    • fi
      -
    • MYSQL_LIB_NAME='mysqlclient'
    • if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
    • AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
    • MYSQL_LIB_CFG='--libmysqld-libs'
    • dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
    • mysqli_extra_sources="mysqli_embedded.c"
    • elif test "$enable_maintainer_zts" = "yes"; then
    • MYSQL_LIB_CFG='--libs_r'
    • MYSQL_LIB_NAME='mysqlclient_r'
    • else
    • MYSQL_LIB_CFG='--libs'
    • fi
      -
    • if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then
    • MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
    • MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
    • else
    • AC_MSG_RESULT([mysql_config not found])
    • AC_MSG_ERROR([Please reinstall the mysql distribution])
    • fi
      -
    • dnl
    • dnl Check the library
    • dnl
    • PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_server_option,
    • [
    • PHP_EVAL_INCLINE($MYSQLI_INCLINE)
    • PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD)
    • AC_DEFINE(HAVE_MYSQLILIB, 1, [ ])
    • PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_character_set,
    • [ ],[
    • AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries.])
    • ],[$MYSQLI_LIBLINE])
    • ],[
    • AC_MSG_ERROR([wrong mysql library version or lib not found. Check config.log for more information.])
    • ],[
    • $MYSQLI_LIBLINE
    • ])
      -
    • mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c"
      -fi
      -
      -dnl Build extension
      -if test -n "$mysqli_extra_sources" || test "$PHP_MYSQLI" != "no"; then
    • mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
    • mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
    • mysqli_exception.c $mysqli_extra_sources"
    • PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
    • PHP_SUBST(MYSQLI_SHARED_LIBADD)
      -
    • dnl These 3 lines are neeeded to be able to build ext/mysql and/or ext/mysqli with/without mysqlnd.
    • dnl Need to do this here for the file to be always available.
    • $php_shtool mkdir -p ext/mysqli/
    • echo > ext/mysqli/php_have_mysqlnd.h
    • test "$PHP_MYSQLI" = "mysqlnd" && PHP_DEFINE(HAVE_MYSQLND, 1, [ext/mysqli])
      -fi
      -
      -dnl MySQLnd build
      -dnl If some extension uses mysqlnd it will get compiled in PHP whether MYSQLi is enabled or not.
      -if test "$PHP_MYSQLND_ENABLED" = "yes"; then
      -dnl AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
      -dnl #include <sys/types.h>
      -dnl ])
      -dnl AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [
      -dnl #include <stdint.h>
      -dnl ])
    • PHP_CHECK_SIZEOF(int8, 0)
    • PHP_CHECK_SIZEOF(uint8, 0)
    • PHP_CHECK_SIZEOF(int16, 0)
    • PHP_CHECK_SIZEOF(uint16, 0)
    • PHP_CHECK_SIZEOF(int32, 0)
    • PHP_CHECK_SIZEOF(uint32, 0)
    • PHP_CHECK_SIZEOF(int64, 0)
    • PHP_CHECK_SIZEOF(uint64, 0)
    • PHP_CHECK_SIZEOF(int8_t, 0)
    • PHP_CHECK_SIZEOF(uint8_t, 0)
    • PHP_CHECK_SIZEOF(int16_t, 0)
    • PHP_CHECK_SIZEOF(uint16_t, 0)
    • PHP_CHECK_SIZEOF(int32_t, 0)
    • PHP_CHECK_SIZEOF(uint32_t, 0)
    • PHP_CHECK_SIZEOF(int64_t, 0)
    • PHP_CHECK_SIZEOF(uint64_t, 0)
    • PHP_CHECK_SIZEOF(ulong, 0)
      -
    • mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
    • mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \
    • mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\
    • mysqlnd_result.c mysqlnd_result_meta.c"
      -
    • PHP_ADD_SOURCES(ext/mysqli/mysqlnd, $mysqlnd_sources)
    • PHP_ADD_BUILD_DIR([ext/mysqli/mysqlnd])
    • EXT_STATIC="$EXT_STATIC mysqlnd"
    • EXT_CLI_STATIC="$EXT_CLI_STATIC mysqlnd"
    • PHP_INSTALL_HEADERS([ext/mysqli/mysqlnd])
      -fi
      -

Modified: trunk/php5/ext/mysqli/mysqli_mysqlnd.h

  • trunk/php5/ext/mysqli/mysqli_mysqlnd.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysqli/mysqli_mysqlnd.h 2007-07-26 19:28:06 UTC (rev 843) @@ -22,7 +22,7 @@ #ifndef MYSQL_MYSQLND_H #define MYSQL_MYSQLND_H

-#include "ext/mysqli/mysqlnd/mysqlnd_libmysql_compat.h"
+#include "ext/mysqlnd/mysqlnd_libmysql_compat.h"  

 /* Here comes non-libmysql API to have less ifdefs in mysqli*/ 

 #define MYSQLI_CLOSE_EXPLICIT                  MYSQLND_CLOSE_EXPLICIT
Can't find what you're looking for?X

Deleted: trunk/php5/ext/mysqli/mysqlnd

  • trunk/php5/ext/mysqli/mysqlnd 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysqli/mysqlnd 2007-07-26 19:28:06 UTC (rev 843) @@ -1 +0,0 @@
    -link ../../../mysqlnd/
    \ No newline at end of file

Modified: trunk/php5/ext/mysqli/php_mysqli.h

  • trunk/php5/ext/mysqli/php_mysqli.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysqli/php_mysqli.h 2007-07-26 19:28:06 UTC (rev 843) @@ -12,7 +12,9 @@ | obtain it through the world-wide-web, please send a note to | | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+
    - | Author: Georg Richter <georg@php.net> |
    + | Authors: Georg Richter <georg@php.net> | + | Andrey Hristov <andrey@php.net> | + | Ulf Wendel <uw@php.net> | +----------------------------------------------------------------------+

   $Id: php_mysqli.h,v 1.54.2.7.2.5 2007/02/24 14:33:50 helly Exp $ @@ -21,6 +23,7 @@
 #ifndef PHP_MYSQLI_H
 #define PHP_MYSQLI_H  

+ 

 PHP_MINIT_FUNCTION(mysqli);
 PHP_MSHUTDOWN_FUNCTION(mysqli);
 PHP_RINIT_FUNCTION(mysqli);

@@ -146,9 +149,6 @@  

 #endif /* PHP_MYSQLI.H */  

-#include "ext/mysqli/mysqlnd/php_mysqlnd.h"
-
-

 /*
  * Local variables:
  * tab-width: 4

Modified: trunk/php5/ext/mysqli/php_mysqli_structs.h

  • trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php5/ext/mysqli/php_mysqli_structs.h 2007-07-26 19:28:06 UTC (rev 843) @@ -36,12 +36,8 @@ #define FALSE 0 #endif

-#ifdef PHP_ATOM_INC
-#include "ext/mysqli/php_have_mysqlnd.h" /* HAVE_MYSQLND is defined here if enabled */
-#endif
-
-#if defined(HAVE_MYSQLND)
-#include "ext/mysqli/mysqlnd/mysqlnd.h"

+#ifdef HAVE_MYSQLND
+#include "ext/mysqlnd/mysqlnd.h"
 #include "ext/mysqli/mysqli_mysqlnd.h"

Confused? Frustrated?X

 #else
 #include 
@@ -346,11 +342,11 @@
 	char			*default_socket;
 	char			*default_pw;
 	long			reconnect;

-	long 			allow_local_infile;

+	long			allow_local_infile;
 	long			strict;
 	long			error_no;
 	char			*error_msg;

-	int				report_mode;

+	long			report_mode;
 	HashTable		*report_ht;
 	unsigned long	multi_query;
 	unsigned long	embedded;
Don't know where to look next?X

Modified: trunk/php6/ext/mysql/config.m4

  • trunk/php6/ext/mysql/config.m4 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysql/config.m4 2007-07-26 19:28:06 UTC (rev 843) @@ -1,5 +1,5 @@ dnl
    -dnl $Id: config.m4,v 1.67.2.1.2.1 2006/06/01 19:14:48 mike Exp $
    +dnl $Id: config.m4,v 1.70 2007/07/25 23:47:32 jani Exp $ dnl

 AC_DEFUN([MYSQL_LIB_CHK], [
@@ -140,7 +140,6 @@

   PHP_ADD_LIBRARY_WITH_PATH($MYSQL_LIBNAME, $MYSQL_LIB_DIR, MYSQL_SHARED_LIBADD)    PHP_ADD_INCLUDE($MYSQL_INC_DIR)  
-

   MYSQL_MODULE_TYPE=external
   MYSQL_LIBS="-L$MYSQL_LIB_DIR -l$MYSQL_LIBNAME $MYSQL_LIBS"
   MYSQL_INCLUDE=-I$MYSQL_INC_DIR

@@ -156,9 +155,7 @@

   PHP_NEW_EXTENSION(mysql, php_mysql.c, $ext_shared)    PHP_SUBST(MYSQL_SHARED_LIBADD)  

  • dnl These 3 lines are neeeded to be able to build ext/mysql and/or ext/mysqli with/without mysqlnd.
  • dnl Need to do this here for the file to be always available.
  • $php_shtool mkdir -p ext/mysql/
  • echo > ext/mysql/php_have_mysqlnd.h
  • test "$PHP_MYSQL" = "mysqlnd" && PHP_DEFINE(HAVE_MYSQLND, 1, [ext/mysql]) + if test "$PHP_MYSQL" = "mysqlnd"; then + PHP_ADD_EXTENSION_DEP(mysql, mysqlnd) + fi fi

Modified: trunk/php6/ext/mysql/config.w32

  • trunk/php6/ext/mysql/config.w32 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysql/config.w32 2007-07-26 19:28:06 UTC (rev 843) @@ -1,15 +1,19 @@
    -// $Id: config.w32,v 1.2 2005/06/05 19:25:00 wez Exp $
    +// $Id: config.w32,v 1.3 2007/07/25 23:47:32 jani Exp $ // vim:ft=javascript

 ARG_WITH("mysql", "MySQL support", "no");  

 if (PHP_MYSQL != "no") {
- if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) &&

  • CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL",
  • PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) {
  • EXTENSION("mysql", "php_mysql.c");
  • AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library');
  • } else {
  • WARNING("mysql not enabled; libraries and headers not found");
  • } + if (PHP_MYSQLI != "mysqlnd") { + if (CHECK_LIB("libmysql.lib", "mysql", PHP_MYSQL) && + CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQL", + PHP_MYSQL + "\\include;" + PHP_PHP_BUILD + "\\include\\mysql;" + PHP_MYSQL)) { + } else { + WARNING("mysql not enabled; libraries and headers not found"); + } + } else { + ADD_EXTENSION_DEP('mysql', 'mysqlnd', true); + } + EXTENSION("mysql", "php_mysql.c"); + AC_DEFINE('HAVE_MYSQL', 1, 'Have MySQL library'); }

Modified: trunk/php6/ext/mysql/mysql_mysqlnd.h

  • trunk/php6/ext/mysql/mysql_mysqlnd.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysql/mysql_mysqlnd.h 2007-07-26 19:28:06 UTC (rev 843) @@ -22,7 +22,7 @@ #ifndef MYSQL_MYSQLND_H #define MYSQL_MYSQLND_H
Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365X

-#include "ext/mysqli/mysqlnd/mysqlnd_libmysql_compat.h"
+#include "ext/mysqlnd/mysqlnd_libmysql_compat.h"  

 /* Here comes non-libmysql API to have less ifdefs in mysqli*/ 

 #define MYSQLI_CLOSE_EXPLICIT                  MYSQLND_CLOSE_EXPLICIT

Modified: trunk/php6/ext/mysql/package.xml

  • trunk/php6/ext/mysql/package.xml 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysql/package.xml 2007-07-26 19:28:06 UTC (rev 843) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="ISO-8859-1" ?> <!DOCTYPE package SYSTEM "../pear/package.dtd"> <package>
    - <name>mysqli</name>
    + <name>mysql</name> <summary>MySQL database access functions</summary> <maintainers> <maintainer>

Modified: trunk/php6/ext/mysql/php_mysql.h

  • trunk/php6/ext/mysql/php_mysql.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysql/php_mysql.h 2007-07-26 19:28:06 UTC (rev 843) @@ -42,12 +42,8 @@ #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/mysqlnd/mysqlnd.h"
 #include "ext/mysql/mysql_mysqlnd.h"
 #else
 #include 
@@ -152,8 +148,4 @@

 #define phpext_mysql_ptr mysql_module_ptr  

-
-#include "ext/mysqli/mysqlnd/php_mysqlnd.h"
-
-

 #endif /* PHP_MYSQL_H */

Added: trunk/php6/ext/mysqli/config.m4

  • trunk/php6/ext/mysqli/config.m4 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysqli/config.m4 2007-07-26 19:28:06 UTC (rev 843) @@ -0,0 +1,77 @@ +dnl +dnl $Id: config.m4,v 1.28 2007/07/25 23:47:32 jani Exp $ +dnl config.m4 for extension mysqli + +PHP_ARG_WITH(mysqli, for MySQLi support, +[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname to mysql_config [mysql_config]. + If mysqlnd is passed as FILE, the MySQL native driver will be used]) + +PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support, +[ --enable-embedded-mysqli MYSQLi: Enable embedded support], no, no) + +if test "$PHP_MYSQLI" = "mysqlnd"; then + dnl This needs to be set in any extension which wishes to use mysqlnd + PHP_MYSQLND_ENABLED=yes + +elif test "$PHP_MYSQLI" != "no"; then + + if test "$PHP_MYSQLI" = "yes"; then + MYSQL_CONFIG=`$php_shtool path mysql_config` + else + MYSQL_CONFIG=$PHP_MYSQLI + fi + + MYSQL_LIB_NAME='mysqlclient' + if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then + AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled]) + MYSQL_LIB_CFG='--libmysqld-libs' + dnl mysqlnd doesn't support embedded, so we have to add some extra stuff + mysqli_extra_sources="mysqli_embedded.c" + elif test "$enable_maintainer_zts" = "yes"; then + MYSQL_LIB_CFG='--libs_r' + MYSQL_LIB_NAME='mysqlclient_r' + else + MYSQL_LIB_CFG='--libs' + fi + + if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then + MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"` + MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"` + else + AC_MSG_RESULT([mysql_config not found]) + AC_MSG_ERROR([Please reinstall the mysql distribution]) + fi + + dnl + dnl Check the library + dnl + PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_server_option, + [ + PHP_EVAL_INCLINE($MYSQLI_INCLINE) + PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD) + AC_DEFINE(HAVE_MYSQLILIB, 1, [ ]) + PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_character_set, + [ ],[ + AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries.]) + ],[$MYSQLI_LIBLINE]) + ],[ + AC_MSG_ERROR([wrong mysql library version or lib not found. Check config.log for more information.]) + ],[ + $MYSQLI_LIBLINE + ]) + + mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c" +fi + +dnl Build extension +if test "$PHP_MYSQLI" != "no"; then + mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \ + mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \ + mysqli_exception.c $mysqli_extra_sources" + PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared) + PHP_SUBST(MYSQLI_SHARED_LIBADD) + + if test "$PHP_MYSQLI" = "mysqlnd"; then + PHP_ADD_EXTENSION_DEP(mysqli, mysqlnd) + fi +fi
Do you need help?X

Modified: trunk/php6/ext/mysqli/config.w32

  • trunk/php6/ext/mysqli/config.w32 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysqli/config.w32 2007-07-26 19:28:06 UTC (rev 843) @@ -2,12 +2,11 @@ // vim:ft=javascript 
 // Note: The extension name is "mysqli", you enable it with "--with-mysqli".

-// The "--enable-mysqlnd" tells to use "mysqli", if enabled, with the bundled

+// Passing value "mysqlnd" to it enables the bundled
 // client library to connect to the MySQL server, i.e. no external MySQL
 // client library is needed to perform the build.

 ARG_WITH("mysqli", "MySQLi support", "no");
-ARG_ENABLE("mysqlnd", "MySQLi with mysqlnd support", "no");
 

 if (PHP_MYSQLI != "no") {  

@@ -23,7 +22,7 @@ 

         "mysqli_report.c " +
         "mysqli_warning.c";
  • if (PHP_MYSQLND == "no") { + if (PHP_MYSQLI != "mysqlnd") { if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) && CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + "\\include;" + PHP_PHP_BUILD + @@ -38,27 +37,8 @@

   } else {  

  • mysqlnd_source =
  • "mysqlnd.c " +
    -// "mysqlnd_alloc.c " +
  • "mysqlnd_charset.c " +
  • "mysqlnd_loaddata.c " +
  • "mysqlnd_palloc.c " +
  • "mysqlnd_ps.c " +
  • "mysqlnd_ps_codec.c " +
  • "mysqlnd_qcache.c " +
  • "mysqlnd_result.c " +
  • "mysqlnd_result_meta.c " +
  • "mysqlnd_statistics.c " +
  • "mysqlnd_wireprotocol.c";
    -
    EXTENSION("mysqli", mysqli_source);
  • // Specify that add "mysqlnd" sources, but use same object file
  • // directory as the "mysqli" sources
  • // FIXME the hard coded "ext/mysqli/mysqlnd" prevents pointing
  • // out sources in another directory? Like above: PHP_MYSQLI + "\\include;"
  • ADD_SOURCES("ext/mysqli/mysqlnd", mysqlnd_source, "mysqli"); AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
  • AC_DEFINE('HAVE_MYSQLND' , 1, 'MySQL native driver support enabled'); + ADD_EXTENSION_DEP('mysqli', 'mysqlnd', true); } }

Deleted: trunk/php6/ext/mysqli/config9.m4

  • trunk/php6/ext/mysqli/config9.m4 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysqli/config9.m4 2007-07-26 19:28:06 UTC (rev 843) @@ -1,119 +0,0 @@
    -dnl
    -dnl $Id: config.m4,v 1.25 2006/10/09 04:46:03 georg Exp $
    -dnl config.m4 for extension mysqli
    -
    -PHP_ARG_WITH(mysqli, for MySQLi support,
    -[ --with-mysqli[=FILE] Include MySQLi support. FILE is the optional pathname to mysql_config [mysql_config].
    • If mysqlnd is passed as FILE, the MySQL native driver will be used])
      -
      -PHP_ARG_ENABLE(embedded_mysqli, whether to enable embedded MySQLi support,
      -[ --enable-embedded-mysqli MYSQLi: Enable embedded support], no, no)
      -
      -if test "$PHP_MYSQLI" = "mysqlnd"; then
    • dnl This needs to be set in any extension which wishes to use mysqlnd
    • PHP_MYSQLND_ENABLED=yes
      -
      -elif test "$PHP_MYSQLI" != "no"; then
      -
    • if test "$PHP_MYSQLI" = "yes"; then
    • MYSQL_CONFIG=`$php_shtool path mysql_config`
    • else
    • MYSQL_CONFIG=$PHP_MYSQLI
    • fi
      -
    • MYSQL_LIB_NAME='mysqlclient'
    • if test "$PHP_EMBEDDED_MYSQLI" = "yes"; then
    • AC_DEFINE(HAVE_EMBEDDED_MYSQLI, 1, [embedded MySQL support enabled])
    • MYSQL_LIB_CFG='--libmysqld-libs'
    • dnl mysqlnd doesn't support embedded, so we have to add some extra stuff
    • mysqli_extra_sources="mysqli_embedded.c"
    • elif test "$enable_maintainer_zts" = "yes"; then
    • MYSQL_LIB_CFG='--libs_r'
    • MYSQL_LIB_NAME='mysqlclient_r'
    • else
    • MYSQL_LIB_CFG='--libs'
    • fi
      -
    • if test -x "$MYSQL_CONFIG" && $MYSQL_CONFIG $MYSQL_LIB_CFG > /dev/null 2>&1; then
    • MYSQLI_INCLINE=`$MYSQL_CONFIG --cflags | $SED -e "s/'//g"`
    • MYSQLI_LIBLINE=`$MYSQL_CONFIG $MYSQL_LIB_CFG | $SED -e "s/'//g"`
    • else
    • AC_MSG_RESULT([mysql_config not found])
    • AC_MSG_ERROR([Please reinstall the mysql distribution])
    • fi
      -
    • dnl
    • dnl Check the library
    • dnl
    • PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_server_option,
    • [
    • PHP_EVAL_INCLINE($MYSQLI_INCLINE)
    • PHP_EVAL_LIBLINE($MYSQLI_LIBLINE, MYSQLI_SHARED_LIBADD)
    • AC_DEFINE(HAVE_MYSQLILIB, 1, [ ])
    • PHP_CHECK_LIBRARY($MYSQL_LIB_NAME, mysql_set_character_set,
    • [ ],[
    • AC_MSG_ERROR([MySQLI doesn't support versions < 4.1.13 (for MySQL 4.1.x) and < 5.0.7 for (MySQL 5.0.x) anymore. Please update your libraries.])
    • ],[$MYSQLI_LIBLINE])
    • ],[
    • AC_MSG_ERROR([wrong mysql library version or lib not found. Check config.log for more information.])
    • ],[
    • $MYSQLI_LIBLINE
    • ])
      -
    • mysqli_extra_sources="$mysqli_extra_sources mysqli_repl.c"
      -fi
      -
      -dnl Build extension
      -if test -n "$mysqli_extra_sources" || test "$PHP_MYSQLI" != "no"; then
    • mysqli_sources="mysqli.c mysqli_api.c mysqli_prop.c mysqli_nonapi.c \
    • mysqli_fe.c mysqli_report.c mysqli_driver.c mysqli_warning.c \
    • mysqli_exception.c $mysqli_extra_sources"
    • PHP_NEW_EXTENSION(mysqli, $mysqli_sources, $ext_shared)
    • PHP_SUBST(MYSQLI_SHARED_LIBADD)
      -
    • dnl These 3 lines are neeeded to be able to build ext/mysql and/or ext/mysqli with/without mysqlnd.
    • dnl Need to do this here for the file to be always available.
    • $php_shtool mkdir -p ext/mysqli/
    • echo > ext/mysqli/php_have_mysqlnd.h
    • test "$PHP_MYSQLI" = "mysqlnd" && PHP_DEFINE(HAVE_MYSQLND, 1, [ext/mysqli])
      -fi
      -
      -dnl MySQLnd build
      -dnl If some extension uses mysqlnd it will get compiled in PHP whether MYSQLi is enabled or not.
      -if test "$PHP_MYSQLND_ENABLED" = "yes"; then
      -dnl AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, uchar],[],[], [
      -dnl #include <sys/types.h>
      -dnl ])
      -dnl AC_CHECK_TYPES([int8_t, uint8_t, int16_t, uint16_t, int32_t, uint32_t, int64_t, uint64_t],[],[], [
      -dnl #include <stdint.h>
      -dnl ])
    • PHP_CHECK_SIZEOF(int8, 0)
    • PHP_CHECK_SIZEOF(uint8, 0)
    • PHP_CHECK_SIZEOF(int16, 0)
    • PHP_CHECK_SIZEOF(uint16, 0)
    • PHP_CHECK_SIZEOF(int32, 0)
    • PHP_CHECK_SIZEOF(uint32, 0)
    • PHP_CHECK_SIZEOF(int64, 0)
    • PHP_CHECK_SIZEOF(uint64, 0)
    • PHP_CHECK_SIZEOF(int8_t, 0)
    • PHP_CHECK_SIZEOF(uint8_t, 0)
    • PHP_CHECK_SIZEOF(int16_t, 0)
    • PHP_CHECK_SIZEOF(uint16_t, 0)
    • PHP_CHECK_SIZEOF(int32_t, 0)
    • PHP_CHECK_SIZEOF(uint32_t, 0)
    • PHP_CHECK_SIZEOF(int64_t, 0)
    • PHP_CHECK_SIZEOF(uint64_t, 0)
    • PHP_CHECK_SIZEOF(ulong, 0)
      -
    • mysqlnd_sources="mysqlnd.c mysqlnd_charset.c mysqlnd_wireprotocol.c \
    • mysqlnd_ps.c mysqlnd_loaddata.c mysqlnd_palloc.c \
    • mysqlnd_ps_codec.c mysqlnd_statistics.c mysqlnd_qcache.c\
    • mysqlnd_result.c mysqlnd_result_meta.c"
      -
    • PHP_ADD_SOURCES(ext/mysqli/mysqlnd, $mysqlnd_sources)
    • PHP_ADD_BUILD_DIR([ext/mysqli/mysqlnd])
    • EXT_STATIC="$EXT_STATIC mysqlnd"
    • EXT_CLI_STATIC="$EXT_CLI_STATIC mysqlnd"
    • PHP_INSTALL_HEADERS([ext/mysqli/mysqlnd])
      -fi
      -

Modified: trunk/php6/ext/mysqli/mysqli_mysqlnd.h

  • trunk/php6/ext/mysqli/mysqli_mysqlnd.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysqli/mysqli_mysqlnd.h 2007-07-26 19:28:06 UTC (rev 843) @@ -22,7 +22,7 @@ #ifndef MYSQL_MYSQLND_H #define MYSQL_MYSQLND_H

-#include "ext/mysqli/mysqlnd/mysqlnd_libmysql_compat.h"
+#include "ext/mysqlnd/mysqlnd_libmysql_compat.h"  

Do you need more help?X

 /* Here comes non-libmysql API to have less ifdefs in mysqli*/ 

 #define MYSQLI_CLOSE_EXPLICIT                  MYSQLND_CLOSE_EXPLICIT

Deleted: trunk/php6/ext/mysqli/mysqlnd

  • trunk/php6/ext/mysqli/mysqlnd 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysqli/mysqlnd 2007-07-26 19:28:06 UTC (rev 843) @@ -1 +0,0 @@
    -link ../../../mysqlnd/
    \ No newline at end of file

Modified: trunk/php6/ext/mysqli/php_mysqli.h

  • trunk/php6/ext/mysqli/php_mysqli.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysqli/php_mysqli.h 2007-07-26 19:28:06 UTC (rev 843) @@ -144,14 +144,11 @@ ZEND_FUNCTION(mysqli_driver_construct); ZEND_METHOD(mysqli_warning,__construct);

-

 #define phpext_mysqli_ptr &mysqli_module_entry  extern zend_module_entry mysqli_module_entry;  

 #endif /* PHP_MYSQLI.H */  

-#include "ext/mysqli/mysqlnd/php_mysqlnd.h"
-

 /*
  * Local variables:
  * tab-width: 4

Modified: trunk/php6/ext/mysqli/php_mysqli_structs.h

  • trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-07-26 14:41:55 UTC (rev 842) +++ trunk/php6/ext/mysqli/php_mysqli_structs.h 2007-07-26 19:28:06 UTC (rev 843) @@ -36,12 +36,8 @@ #define FALSE 0 #endif

-#ifdef PHP_ATOM_INC
-#include "ext/mysqli/php_have_mysqlnd.h" /* HAVE_MYSQLND is defined here if enabled */
-#endif
-
-#if defined(HAVE_MYSQLND)
-#include "ext/mysqli/mysqlnd/mysqlnd.h"

+#ifdef HAVE_MYSQLND
+#include "ext/mysqlnd/mysqlnd.h"
 #include "ext/mysqli/mysqli_mysqlnd.h"
 #else
 #include
Can we help you?X

--

MySQL Code Commits Mailing List
For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.com Received on Thu Jul 26 15:28:20 2007

This archive was generated by hypermail 2.1.8 : Thu Aug 09 2007 - 19:15:39 EDT

Contact Us  Legal Notices  Order Services Online 
Pantek Home  Privacy Policy  IT news  Site Map  Pantek Library