MFH: Add mysqlnd support for PDO_mysql, fixes at least bug#41997,#42499,

     pecl#12794, pecl#12401

# Running the tests:
# (Note: Doesn't work currnetly on HEAD, see:
#  http://news.php.net/php.qa/64378)
#
#  PDO_MYSQL_TEST_DSN  - DSN
#    For example: mysql:dbname=test;host=localhost;port=3306
#
#  PDO_MYSQL_TEST_HOST    - database host
#  PDO_MYSQL_TEST_DB      - database (schema) name
#  PDO_MYSQL_TEST_SOCKET  - database server socket
#  PDO_MYSQL_TEST_ENGINE  - storage engine to use
#  PDO_MYSQL_TEST_USER    - database user
#  PDO_MYSQL_TEST_PASS    - database user password
#  PDO_MYSQL_TEST_CHARSET - database charset
#
#  NOTE: if any of PDO_MYSQL_TEST_[HOST|DB|SOCKET|ENGINE|CHARSET] is
#  part of PDO_MYSQL_TEST_DSN, the values must match. That is, for example,
#  for PDO_MYSQL_TEST_DSN = mysql:dbname=test you MUST set PDO_MYSQL_TEST_DB=test.

Author: johannes

NEWS

@@ -206,7 +206,9 @@ PHP                                                                        NEWS
 - Fixed an issue where exec() on Windows would eat the first and last double quotes.
   (Scott)
 
+- Fixed PECL bug #12794 (PDOStatement->nextRowset() doesn�t work). (Johannes)
 - Fixed PECL bug #12431 (OCI8 ping functionality is broken). (Oracle Corp.)
+- Fixed PECL bug #12401 (Add support for ATTR_FETCH_TABLE_NAMES). (Johannes)
 
 - Fixed bug #45571 (ReflectionClass::export() shows superclasses' private static 
   methods). (robin_fernandes at uk dot ibm dot com)
@@ -266,6 +268,8 @@ PHP                                                                        NEWS
 - Fixed bug #42637 (SoapFault : Only http and https are allowed). (Bill Moran)
 - Fixed bug #42548 (mysqli PROCEDURE calls can't return result sets). (hartmut)
 - Fixed bug #42509 (gmp leaks memory when gmp_init() not used). (Stas)
+- Fixed bug #42499 (PDO_MYSQL: multi-statement execution via PDO::exec() makes
+  connection unusable). (Johannes)
 - Fixed bug #42443 (PDO SQLite driver binds integers and booleans as strings).
   (Scott)
 - Fixed bug #42284 (duplicate of #39700). (Lars W)
@@ -274,6 +278,8 @@ PHP                                                                        NEWS
   DateTimeZone). (Derick)
 - Fixed bug #42069 (parse_ini_file() allows using some non-alpha numeric
   characters). (Jani)
+- Fixed bug #41997 (pdo_mysql: stored procedure call returning single rowset
+  blocks future queries). (Johannes)
 - Fixed bug #41599 (setTime() fails after modify() is used). (Derick)
 - Fixed bug #41522 (PDO firebird driver returns null if it fails to connect).
   (Lars W)

ext/pdo/pdo_stmt.c

@@ -545,6 +545,20 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, int colno, int *typ
 	stmt->methods->get_col(stmt, colno, &value, &value_len, &caller_frees TSRMLS_CC);
 
 	switch (type) {
+		case PDO_PARAM_ZVAL:
+			if (value && value_len == sizeof(zval)) {
+				int need_copy = (new_type != PDO_PARAM_ZVAL || stmt->dbh->stringify) ? 1 : 0;
+				zval *zv = *(zval**)value;
+				ZVAL_ZVAL(dest, zv, need_copy, 1);
+			} else {
+				ZVAL_NULL(dest);
+			}
+			
+			if (Z_TYPE_P(dest) == IS_NULL) {
+				type = new_type;
+			}
+			break;
+			
 		case PDO_PARAM_INT:
 			if (value && value_len == sizeof(long)) {
 				ZVAL_LONG(dest, *(long*)value);
@@ -1883,7 +1897,10 @@ static PHP_METHOD(PDOStatement, getColumnMeta)
 	add_assoc_string(return_value, "name", col->name, 1);
 	add_assoc_long(return_value, "len", col->maxlen); /* FIXME: unsigned ? */
 	add_assoc_long(return_value, "precision", col->precision);
-	add_assoc_long(return_value, "pdo_type", col->param_type);
+	if (col->param_type != PDO_PARAM_ZVAL) {
+		/* if param_type is PDO_PARAM_ZVAL the driver has to provide correct data */
+		add_assoc_long(return_value, "pdo_type", col->param_type);
+	}
 }
 /* }}} */
 

ext/pdo/php_pdo_driver.h

@@ -44,7 +44,7 @@ PDO_API char *php_pdo_int64_to_str(pdo_int64_t i64 TSRMLS_DC);
 # define FALSE 0
 #endif
 
-#define PDO_DRIVER_API	20060511
+#define PDO_DRIVER_API	20080721
 
 enum pdo_param_type {
 	PDO_PARAM_NULL,
@@ -67,7 +67,12 @@ enum pdo_param_type {
 	PDO_PARAM_STMT, /* hierarchical result set */
 
 	/* get_col ptr should point to a zend_bool */
-	PDO_PARAM_BOOL
+	PDO_PARAM_BOOL,
+
+	/* get_col ptr should point to a zval*
+	   and the driver is responsible for adding correct type information to get_column_meta()
+	 */
+	PDO_PARAM_ZVAL
 };
 
 /* magic flag to denote a parameter as being input/output */

ext/pdo/tests/bug_34630.phpt

@@ -45,6 +45,8 @@ $db->setAttribute(PDO::ATTR_STRINGIFY_FETCHES, true);
 var_dump($db->query("SELECT * from test")->fetchAll(PDO::FETCH_ASSOC));
 
 ?>
+--XFAIL--
+This bug might be still open on aix5.2-ppc64 and hpux11.23-ia64
 --EXPECT--
 array(1) {
   [0]=>

ext/pdo/tests/bug_39656.phpt

@@ -1,7 +1,7 @@
 --TEST--
 PDO Common: Bug #39656 (Crash when calling fetch() on a PDO statment object after closeCursor())
 --SKIPIF--
-<?php  
+<?php
 if (!extension_loaded('pdo')) die('skip');
 $dir = getenv('REDIR_TEST_DIR');
 if (false == $dir) die('skip no driver');
@@ -15,13 +15,13 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE_
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
-@$db->exec("DROP TABLE testtable");
+@$db->exec("DROP TABLE test");
 $db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 
-$db->exec("CREATE TABLE testtable (id INTEGER NOT NULL PRIMARY KEY, usr VARCHAR( 256 ) NOT NULL)");
-$db->exec("INSERT INTO testtable (id, usr) VALUES (1, 'user')");
+$db->exec("CREATE TABLE test (id INTEGER NOT NULL PRIMARY KEY, usr VARCHAR( 256 ) NOT NULL)");
+$db->exec("INSERT INTO test (id, usr) VALUES (1, 'user')");
 
-$stmt = $db->prepare("SELECT * FROM testtable WHERE id = ?");
+$stmt = $db->prepare("SELECT * FROM test WHERE id = ?");
 $stmt->bindValue(1, 1, PDO::PARAM_INT );
 $stmt->execute();
 $row = $stmt->fetch();
@@ -32,9 +32,10 @@ $stmt->closeCursor();
 $row = $stmt->fetch(); // this line will crash CLI
 var_dump( $row );
 
+@$db->exec("DROP TABLE test");
 echo "Done\n";
 ?>
---EXPECT--	
+--EXPECT--
 array(4) {
   ["id"]=>
   string(1) "1"

ext/pdo/tests/bug_43130.phpt

@@ -16,6 +16,9 @@ if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE_
 require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
+if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql')
+	$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, 1);
+
 $db->exec("CREATE TABLE test (a varchar(100), b varchar(100), c varchar(100))");
 
 for ($i = 0; $i < 5; $i++) {

ext/pdo/tests/bug_43663.phpt

@@ -2,7 +2,12 @@
 PDO Common: Bug #43663 (__call on classes derived from PDO)
 --SKIPIF--
 <?php # vim:ft=php
-if (!extension_loaded('pdo_sqlite')) die('skip no pdo_sqlite');
+if (!extension_loaded('pdo')) die('skip');
+if (!extension_loaded('pdo_sqlite')) die('skip');
+$dir = getenv('REDIR_TEST_DIR');
+if (false == $dir) die('skip no driver');
+require_once $dir . 'pdo_test.inc';
+PDOTest::skip();
 ?>
 --FILE--
 <?php
@@ -14,6 +19,10 @@ class test extends PDO{
         echo "Called foo in ".__CLASS__."\n";
     }
 }
+
+if (getenv('REDIR_TEST_DIR') === false) putenv('REDIR_TEST_DIR='.dirname(__FILE__) . '/../../pdo/tests/');
+require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
+
 $a = new test('sqlite::memory:');
 $a->foo();
 $a->bar();

ext/pdo/tests/bug_44159.phpt

@@ -1,12 +1,16 @@
 --TEST--
 Bug #44159 (Crash: $pdo->setAttribute(PDO::STATEMENT_ATTR_CLASS, NULL))
 --SKIPIF--
-<?php
-if (!extension_loaded('pdo_sqlite')) die('skip no pdo_sqlite');
+<?php # vim:ft=php
+if (!extension_loaded('pdo')) die('skip PDO not available');
+try {
+	$pdo = new PDO("sqlite:/tmp/foo.db");
+} catch (Exception $e) {
+	die("skip PDP_SQLITE not available");
+}
 ?>
 --FILE--
 <?php
-
 $pdo = new PDO("sqlite:/tmp/foo.db");
 
 $attrs = array(PDO::ATTR_STATEMENT_CLASS, PDO::ATTR_STRINGIFY_FETCHES, PDO::NULL_TO_STRING);

ext/pdo/tests/pdo.inc

@@ -7,5 +7,4 @@ function set_sql($name,  $query)
 		$GLOBALS['SQL'][$name] = $query;
 	}
 }
-
 ?>

ext/pdo/tests/pdo_017.phpt

@@ -16,7 +16,8 @@ try {
 }
 
 if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
-	if (false === PDOTest::detect_transactional_mysql_engine($db)) {
+	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+	if (false === MySQLPDOTest::detect_transactional_mysql_engine($db)) {
 		die('skip your mysql configuration does not support working transactions');
 	}
 }
@@ -28,14 +29,15 @@ require_once getenv('REDIR_TEST_DIR') . 'pdo_test.inc';
 $db = PDOTest::factory();
 
 if ($db->getAttribute(PDO::ATTR_DRIVER_NAME) == 'mysql') {
-	$suf = ' Type=' . PDOTest::detect_transactional_mysql_engine($db);
+	require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+	$suf = ' ENGINE=' . MySQLPDOTest::detect_transactional_mysql_engine($db);
 } else {
 	$suf = '';
 }
 
 $db->exec('CREATE TABLE test(id INT NOT NULL PRIMARY KEY, val VARCHAR(10))'.$suf);
-$db->exec("INSERT INTO test VALUES(1, 'A')"); 
-$db->exec("INSERT INTO test VALUES(2, 'B')"); 
+$db->exec("INSERT INTO test VALUES(1, 'A')");
+$db->exec("INSERT INTO test VALUES(2, 'B')");
 $db->exec("INSERT INTO test VALUES(3, 'C')");
 $delete = $db->prepare('DELETE FROM test');