Merge commit '8b9719d' into PHP-5.6

rlerdorf · rlerdorf · commit 7fe21ce0f3fd · 2014-07-30T12:23:36.000-04:00
* commit '8b9719d':
  We need to turn off any strict mode here for this warning to show up
diff --git a/ext/mysqli/tests/066.phpt b/ext/mysqli/tests/066.phpt
@@ -12,6 +12,9 @@ require_once('skipifconnectfailure.inc');
 	/*** test mysqli_connect 127.0.0.1 ***/
 	$mysql = new my_mysqli($host, $user, $passwd, $db, $port, $socket);
 
+	if (!mysqli_query($mysql, "SET sql_mode=''"))
+		printf("[002] Cannot set SQL-Mode, [%d] %s\n", mysqli_errno($mysql), mysqli_error($mysql));
+
 	$mysql->query("DROP TABLE IF EXISTS test_warnings");
 
 	$mysql->query("CREATE TABLE test_warnings (a int not null) ENGINE=myisam");
