PHP mysqlnd svn commit: r202 - in trunk/ext/mysqli: mysqlnd tests

[ahristov]

Author: ahristov
Date: 2007-03-19 19:07:52 +0100 (Mon, 19 Mar 2007)
New Revision: 202

Modified:
   trunk/ext/mysqli/mysqlnd/mysqlnd.h
   trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c
   trunk/ext/mysqli/tests/mysqli_connect_oo.phpt
   trunk/ext/mysqli/tests/mysqli_report.phpt
   trunk/ext/mysqli/tests/mysqli_stmt_error.phpt
Log:
Fixed test and ifndefed L64



Modified: trunk/ext/mysqli/mysqlnd/mysqlnd.h
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd.h	2007-03-19 13:28:08 UTC (rev 201)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd.h	2007-03-19 18:07:52 UTC (rev 202)
@@ -52,7 +52,9 @@
 #ifdef PHP_WIN32
 #define MYSQLND_LLU_SPEC "%I64u"
 #define MYSQLND_LL_SPEC "%I64d"
+#ifndef L64
 #define L64(x) x##i64
+#endif
 typedef unsigned __int64 my_uint64;
 typedef __int64 my_int64;
 typedef unsigned __int64 mynd_ulonglong;
@@ -60,7 +62,9 @@
 #else
 #define MYSQLND_LLU_SPEC "%llu"
 #define MYSQLND_LL_SPEC "%lld"
+#ifndef L64
 #define L64(x) x##LL
+#endif
 typedef unsigned long long my_uint64;
 typedef long long my_int64;
 typedef unsigned long long mynd_ulonglong;

Modified: trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c	2007-03-19 13:28:08 UTC (rev 201)
+++ trunk/ext/mysqli/mysqlnd/mysqlnd_wireprotocol.c	2007-03-19 18:07:52 UTC (rev 202)
@@ -1322,7 +1322,6 @@
 	    the ownership and NULL it.
 	  - PS will pass in it the bound variables, we have to use them! and of course
 	    not free the array. As it is passed to us, we should not clean it ourselves.
-	
 	*/
 	if (!alloca) {
 		efree(p);

Modified: trunk/ext/mysqli/tests/mysqli_connect_oo.phpt
===================================================================
--- trunk/ext/mysqli/tests/mysqli_connect_oo.phpt	2007-03-19 13:28:08 UTC (rev 201)
+++ trunk/ext/mysqli/tests/mysqli_connect_oo.phpt	2007-03-19 18:07:52 UTC (rev 202)
@@ -120,7 +120,7 @@
     print "done!";   
 ?>
 --EXPECTF--
-Warning: mysqli::mysqli(): (%d/%d): Access denied for user 'rootunknown_real'@'%s' (using
password: %s) in %s on line %d
+Warning: mysqli::mysqli(): (%d/%d): Access denied for user '%sunknown_real'@'%s' (using
password: %s) in %s on line %d
 
 Warning: mysqli::close(): Couldn't fetch mysqli in %s on line %d
 ... and now Exceptions

Modified: trunk/ext/mysqli/tests/mysqli_report.phpt
===================================================================
--- trunk/ext/mysqli/tests/mysqli_report.phpt	2007-03-19 13:28:08 UTC (rev 201)
+++ trunk/ext/mysqli/tests/mysqli_report.phpt	2007-03-19 18:07:52 UTC (rev 202)
@@ -237,6 +237,6 @@
 Warning: mysqli_kill(): processid should have positive value in %s on line %d
 
 Warning: mysqli_stmt_prepare(): (%d/%d): You have an error in your SQL syntax; check the
manual that corresponds to your MySQL server version for the right syntax to use near
'FOO' at line 1 in %s on line %d
-[011] Access denied for user 'rootunknown_real'@'localhost' (using password: YES)
-[014] Access denied for user 'rootunknown_real'@'localhost' (using password: YES)
+[011] Access denied for user '%sunknown_real'@'localhost' (using password: YES)
+[014] Access denied for user '%sunknown_real'@'localhost' (using password: YES)
 done! 

Modified: trunk/ext/mysqli/tests/mysqli_stmt_error.phpt
===================================================================
--- trunk/ext/mysqli/tests/mysqli_stmt_error.phpt	2007-03-19 13:28:08 UTC (rev 201)
+++ trunk/ext/mysqli/tests/mysqli_stmt_error.phpt	2007-03-19 18:07:52 UTC (rev 202)
@@ -37,7 +37,7 @@
         printf("[007] [%d] %s\n", mysqli_stmt_error($stmt), mysqli_stmt_error($stmt));
         
     // reset after error & success    
-    if ('' != ($tmp = mysqli_stmt_error($stmt)))
+    if ('' !== ($tmp = mysqli_stmt_error($stmt)))
         printf("[008] Expecting empty string, got %s/%s\n", gettype($tmp), $tmp);
         
     mysqli_kill($link, mysqli_thread_id($link));