PHP mysqlnd svn commit: r1078 - trunk/mysqlnd

[ahristov]

Author: ahristov
Date: 2007-10-04 11:53:52 +0200 (Thu, 04 Oct 2007)
New Revision: 1078

Modified:
   trunk/mysqlnd/config.w32
   trunk/mysqlnd/mysqlnd_structs.h
   trunk/mysqlnd/mysqlnd_wireprotocol.h
Log:
Windows related fixes.


Modified: trunk/mysqlnd/config.w32
===================================================================
--- trunk/mysqlnd/config.w32	2007-10-01 21:17:56 UTC (rev 1077)
+++ trunk/mysqlnd/config.w32	2007-10-04 09:53:52 UTC (rev 1078)
@@ -1,46 +1,12 @@
 // $Id: config.w32,v 1.1 2007/07/25 23:47:32 jani Exp $
 // 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
-// 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") {
-
-  mysqli_source =
-        "mysqli.c " +
-        "mysqli_api.c " +
-        "mysqli_driver.c " +
-        "mysqli_embedded.c " +
-        "mysqli_exception.c " +
-        "mysqli_fe.c " +
-        "mysqli_nonapi.c " +
-        "mysqli_prop.c " +
-        "mysqli_report.c " +
-        "mysqli_warning.c";
-
-  if (PHP_MYSQLND == "no") {
-    if (CHECK_LIB("libmysql.lib", "mysqli", PHP_MYSQLI) &&
-        CHECK_HEADER_ADD_INCLUDE("mysql.h", "CFLAGS_MYSQLI", PHP_MYSQLI + 
-                                 "\\include;" + PHP_PHP_BUILD +
-                                 "\\include\\mysql;" + PHP_MYSQLI)) {
-      // No "mysqli_repl.c" when using "mysqlnd"
-      mysqli_extra_sources = "mysqli_repl.c";
-      EXTENSION("mysqli", mysqli_source + " " + mysqli_extra_sources);
-      AC_DEFINE('HAVE_MYSQLILIB', 1, 'Have MySQLi library');
-    } else {
-      WARNING("mysqli not enabled; libraries and headers not found");
-    }
-
-  } else {
-
+if (PHP_MYSQLI == "mysqlnd" || PHP_MYSQL == "mysqlnd") {
     mysqlnd_source = 
         "mysqlnd.c " +
-//        "mysqlnd_alloc.c " +
         "mysqlnd_debug.c " +
         "mysqlnd_charset.c " +
         "mysqlnd_loaddata.c " +
@@ -53,14 +19,8 @@
         "mysqlnd_statistics.c " +
         "mysqlnd_wireprotocol.c";
 	if (CHECK_LIB("ws2_32.lib", "mysqlnd")) {
-	    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');
+	    EXTENSION("mysqlnd", mysqlnd_source);
+	    AC_DEFINE('HAVE_MYSQLND', 1, 'MySQL native driver support enabled');
 	}
   }
 }

Modified: trunk/mysqlnd/mysqlnd_structs.h
===================================================================
--- trunk/mysqlnd/mysqlnd_structs.h	2007-10-01 21:17:56 UTC (rev 1077)
+++ trunk/mysqlnd/mysqlnd_structs.h	2007-10-04 09:53:52 UTC (rev 1078)
@@ -62,8 +62,8 @@
 {
 	unsigned int		warning_count;
 	unsigned int		server_status;
-	unsigned long long	affected_rows;
-	unsigned long long	last_insert_id;
+	mynd_ulonglong		affected_rows;
+	mynd_ulonglong		last_insert_id;
 } mysqlnd_upsert_status;
 
 
@@ -344,7 +344,7 @@
 	char			*passwd;
 	unsigned int	*passwd_len;
 	char			*scheme;
-	unsigned long long	thread_id;
+	mynd_ulonglong	thread_id;
 	char			*server_version;
 	char			*host_info;
 	unsigned char	*scramble;

Modified: trunk/mysqlnd/mysqlnd_wireprotocol.h
===================================================================
--- trunk/mysqlnd/mysqlnd_wireprotocol.h	2007-10-01 21:17:56 UTC (rev 1077)
+++ trunk/mysqlnd/mysqlnd_wireprotocol.h	2007-10-04 09:53:52 UTC (rev 1078)
@@ -225,8 +225,8 @@
 	*/
 	mysqlnd_2b			warning_count;
 	mysqlnd_2b			server_status;
-	unsigned long long	affected_rows;
-	unsigned long long	last_insert_id;
+	mynd_ulonglong		affected_rows;
+	mynd_ulonglong		last_insert_id;
 	/* This is for both LOAD DATA or info, when no result set */
 	char				*info_or_local_file;
 	size_t				info_or_local_file_len;