Merge branch 'PHP-5.6'

* PHP-5.6:
  Updated NEWS
  Updated NEWS
  Start adding new attribute to control multi statements

Author: Julien Pauli

ext/pdo_mysql/mysql_driver.c

@@ -556,10 +556,14 @@ static int pdo_mysql_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS_
 #ifdef CLIENT_MULTI_RESULTS
 		|CLIENT_MULTI_RESULTS
 #endif
+		;
 #ifdef CLIENT_MULTI_STATEMENTS
-		|CLIENT_MULTI_STATEMENTS
+	if (!driver_options) {
+		connect_opts |= CLIENT_MULTI_STATEMENTS;
+	} else if (pdo_attr_lval(driver_options, PDO_MYSQL_ATTR_MULTI_STATEMENTS, 1 TSRMLS_CC)) {
+		connect_opts |= CLIENT_MULTI_STATEMENTS;
+	}
 #endif
-		;
 
 #if defined(PDO_USE_MYSQLND)
 	int dbname_len = 0;

ext/pdo_mysql/pdo_mysql.c

@@ -126,7 +126,7 @@ static PHP_MINIT_FUNCTION(pdo_mysql)
 #if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
 	 REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_SERVER_PUBLIC_KEY", (zend_long)PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY);
 #endif
-
+	REGISTER_PDO_CLASS_CONST_LONG("MYSQL_ATTR_MULTI_STATEMENTS", (zend_long)PDO_MYSQL_ATTR_MULTI_STATEMENTS);
 
 #ifdef PDO_USE_MYSQLND
 	mysqlnd_reverse_api_register_api(&pdo_mysql_reverse_api TSRMLS_CC);

ext/pdo_mysql/php_pdo_mysql_int.h

@@ -172,8 +172,9 @@ enum {
 	PDO_MYSQL_ATTR_SSL_CAPATH,
 	PDO_MYSQL_ATTR_SSL_CIPHER,
 #if MYSQL_VERSION_ID > 50605 || defined(PDO_USE_MYSQLND)
-	PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY
+	PDO_MYSQL_ATTR_SERVER_PUBLIC_KEY,
 #endif
+	PDO_MYSQL_ATTR_MULTI_STATEMENTS,
 };
 
 #endif

ext/pdo_mysql/tests/pdo_mysql_attr_multi_statements.phpt

@@ -0,0 +1,95 @@
+--TEST--
+PDO::MYSQL_ATTR_MULTI_STATEMENTS
+--SKIPIF--
+<?php
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
+$db = MySQLPDOTest::factory();
+?>
+--INI--
+error_reporting=E_ALL
+--FILE--
+<?php
+	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+
+	$dsn = MySQLPDOTest::getDSN();
+	$user = PDO_MYSQL_TEST_USER;
+	$pass = PDO_MYSQL_TEST_PASS;
+
+	$table = sprintf("test_%s", md5(mt_rand(0, PHP_INT_MAX)));
+	$db = new PDO($dsn, $user, $pass);
+	$db->exec(sprintf('DROP TABLE IF EXISTS %s', $table));
+	$create = sprintf('CREATE TABLE %s(id INT)', $table);
+	$db->exec($create);
+	$db->exec(sprintf('INSERT INTO %s(id) VALUES (1)', $table));
+	$stmt = $db->query(sprintf('SELECT * FROM %s; INSERT INTO %s(id) VALUES (2)', $table, $table));
+	$stmt->closeCursor();
+	$info = $db->errorInfo();
+	var_dump($info[0]);
+	$stmt = $db->query(sprintf('SELECT id FROM %s', $table));
+	var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
+        // A single query with a trailing delimiter.
+	$stmt = $db->query('SELECT 1 AS value;');
+	var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
+
+	// New connection, does not allow multiple statements.
+	$db = new PDO($dsn, $user, $pass, array(PDO::MYSQL_ATTR_MULTI_STATEMENTS => false));
+	$stmt = $db->query(sprintf('SELECT * FROM %s; INSERT INTO %s(id) VALUES (3)', $table, $table));
+	var_dump($stmt);
+	$info = $db->errorInfo();
+	var_dump($info[0]);
+
+	$stmt = $db->query(sprintf('SELECT id FROM %s', $table));
+	var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
+        // A single query with a trailing delimiter.
+        $stmt = $db->query('SELECT 1 AS value;');
+        var_dump($stmt->fetchAll(PDO::FETCH_ASSOC));
+
+	$db->exec(sprintf('DROP TABLE IF EXISTS %s', $table));
+	print "done!";
+?>
+--EXPECTF--
+string(5) "00000"
+array(2) {
+  [0]=>
+  array(1) {
+    ["id"]=>
+    string(1) "1"
+  }
+  [1]=>
+  array(1) {
+    ["id"]=>
+    string(1) "2"
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    ["value"]=>
+    string(1) "1"
+  }
+}
+bool(false)
+string(5) "42000"
+array(2) {
+  [0]=>
+  array(1) {
+    ["id"]=>
+    string(1) "1"
+  }
+  [1]=>
+  array(1) {
+    ["id"]=>
+    string(1) "2"
+  }
+}
+array(1) {
+  [0]=>
+  array(1) {
+    ["value"]=>
+    string(1) "1"
+  }
+}
+done!
+

ext/pdo_mysql/tests/pdo_mysql_class_constants.phpt

@@ -26,6 +26,7 @@ if (!extension_loaded('mysqli') && !extension_loaded('mysqlnd')) {
 		"MYSQL_ATTR_SSL_CAPATH"						=> true,
 		"MYSQL_ATTR_SSL_CIPHER"						=> true,
 		"MYSQL_ATTR_COMPRESS"						=> true,
+		"MYSQL_ATTR_MULTI_STATEMENTS"					=> true,
 	);
 
 	if (!MySQLPDOTest::isPDOMySQLnd()) {