Improve PDO::inTransaction() support for MySQL

Closes GH-4996.

Author: twose

ext/pdo_mysql/mysql_driver.c

@@ -532,6 +532,21 @@ static void pdo_mysql_request_shutdown(pdo_dbh_t *dbh)
 }
 /* }}} */
 
+#ifdef PDO_USE_MYSQLND
+# define pdo_mysql_get_server_status(m) mysqlnd_get_server_status(m)
+#else
+# define pdo_mysql_get_server_status(m) (m)->server_status
+#endif
+
+/* {{{ pdo_mysql_in_transaction */
+static int pdo_mysql_in_transaction(pdo_dbh_t *dbh)
+{
+	pdo_mysql_db_handle *H = (pdo_mysql_db_handle *)dbh->driver_data;
+	PDO_DBG_ENTER("pdo_mysql_in_transaction");
+	PDO_DBG_RETURN((pdo_mysql_get_server_status(H->server) & SERVER_STATUS_IN_TRANS) != 0);
+}
+/* }}} */
+
 /* {{{ mysql_methods */
 static const struct pdo_dbh_methods mysql_methods = {
 	mysql_handle_closer,
@@ -548,7 +563,7 @@ static const struct pdo_dbh_methods mysql_methods = {
 	pdo_mysql_check_liveness,
 	NULL,
 	pdo_mysql_request_shutdown,
-	NULL
+	pdo_mysql_in_transaction
 };
 /* }}} */
 

ext/pdo_mysql/tests/pdo_mysql_inTransaction.phpt

@@ -0,0 +1,67 @@
+--TEST--
+MySQL PDO class inTransaction
+--SKIPIF--
+<?php
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'skipif.inc');
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+MySQLPDOTest::skip();
+?>
+--FILE--
+<?php
+require_once(__DIR__ . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc');
+
+const BEGIN = ['BEGIN', 'START TRANSACTION'];
+const END = ['COMMIT', 'ROLLBACK'];
+
+$db = MySQLPDOTest::factory();
+// $pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, false); // mysql does not support
+for ($b = 0; $b < count(BEGIN); $b++) {
+    for ($e = 0; $e < count(END); $e++) {
+        foreach (['exec', 'query', 'execute'] as $w) {
+            foreach ([BEGIN[$b], END[$e]] as $command) {
+                switch ($w) {
+                    case 'exec':
+                        $db->exec($command);
+                        break;
+                    case'query':
+                        $db->query($command)->execute();
+                        break;
+                    case 'execute':
+                        /* EMULATE_PREPARES = QUERY */
+                        $db->prepare($command)->execute();
+                        break;
+                    default:
+                        assert(0);
+                }
+                var_dump($db->inTransaction());
+            }
+        }
+    }
+}
+
+?>
+--EXPECT--
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)
+bool(true)
+bool(false)