Added transaction check process

fix macro

fix report flags

fix tests

Author: SakiTakamachi

ext/mysqli/mysqli_api.c

@@ -313,6 +313,11 @@ PHP_FUNCTION(mysqli_commit)
 	}
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
+	if (!MYSQLI_IS_IN_TRANSACTION(mysql)) {
+		php_mysqli_report_error(NULL, 0, "There is no active transaction");
+		RETURN_FALSE;
+	}
+
 	if (FAIL == mysqlnd_commit(mysql->mysql, flags, name)) {
 		MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);
 		RETURN_FALSE;
@@ -523,12 +528,12 @@ PHP_FUNCTION(mysqli_execute_query)
 
 	if (FAIL == mysql_stmt_prepare(stmt->stmt, query, query_len)) {
 		MYSQLI_REPORT_STMT_ERROR(stmt->stmt);
-		
+
 		close_stmt_and_copy_errors(stmt, mysql);
 		RETURN_FALSE;
 	}
 
-	/* The bit below, which is copied from mysqli_prepare, is needed for bad index exceptions */ 
+	/* The bit below, which is copied from mysqli_prepare, is needed for bad index exceptions */
 	/* don't initialize stmt->query with NULL, we ecalloc()-ed the memory */
 	/* Get performance boost if reporting is switched off */
 	if (query_len && (MyG(report_mode) & MYSQLI_REPORT_INDEX)) {
@@ -1420,6 +1425,10 @@ PHP_FUNCTION(mysqli_rollback)
 	}
 	MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_VALID);
 
+	if (!MYSQLI_IS_IN_TRANSACTION(mysql)) {
+		php_mysqli_report_error(NULL, 0, "There is no active transaction");
+		RETURN_FALSE;
+	}
 
 	if (FAIL == mysqlnd_rollback(mysql->mysql, flags, name)) {
 		MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);

ext/mysqli/mysqli_nonapi.c

@@ -1021,6 +1021,11 @@ PHP_FUNCTION(mysqli_begin_transaction)
 		RETURN_THROWS();
 	}
 
+	if (MYSQLI_IS_IN_TRANSACTION(mysql)) {
+		php_mysqli_report_error(NULL, 0, "There is already an active transaction");
+		RETURN_FALSE;
+	}
+
 	if (FAIL == mysqlnd_begin_transaction(mysql->mysql, flags, name)) {
 		RETURN_FALSE;
 	}

ext/mysqli/php_mysqli_structs.h

@@ -234,6 +234,8 @@ extern void php_mysqli_fetch_into_hash_aux(zval *return_value, MYSQL_RES * resul
 	intern->ptr = NULL; \
 }
 
+#define MYSQLI_IS_IN_TRANSACTION(__mysql) \
+	((mysqli_server_status(__mysql->mysql) & SERVER_STATUS_IN_TRANS) != 0)
 
 ZEND_BEGIN_MODULE_GLOBALS(mysqli)
 	zend_long			num_links;

ext/mysqli/tests/mysqli_begin_transaction.phpt

@@ -93,6 +93,17 @@ if (!have_innodb($link))
             printf("[021] [%d] %s\n", mysqli_errno($link), mysqli_error($link));
     }
 
+    $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, false);
+    mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT);
+    try {
+        mysqli_begin_transaction($link);
+        mysqli_begin_transaction($link);
+    } catch (\mysqli_sql_exception $e) {
+        echo $e->getMessage() . \PHP_EOL;
+    }
+
+    mysqli_rollback($link);
+
     print "done!";
 ?>
 --CLEAN--
@@ -102,4 +113,5 @@ if (!have_innodb($link))
 --EXPECT--
 NULL
 mysqli_begin_transaction(): Argument #2 ($flags) must be one of the MYSQLI_TRANS_* constants
+There is already an active transaction
 done!

ext/mysqli/tests/mysqli_commit.phpt

@@ -56,6 +56,14 @@ if (!have_innodb($link))
         echo $exception->getMessage() . "\n";
     }
 
+    $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, false);
+    mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT);
+    try {
+        mysqli_commit($link);
+    } catch (\mysqli_sql_exception $e) {
+        echo $e->getMessage() . \PHP_EOL;
+    }
+
     print "done!";
 ?>
 --CLEAN--
@@ -64,4 +72,5 @@ require_once 'clean_table.inc';
 ?>
 --EXPECT--
 mysqli object is already closed
+There is no active transaction
 done!

ext/mysqli/tests/mysqli_rollback.phpt

@@ -53,6 +53,14 @@ if (!have_innodb($link))
         echo $exception->getMessage() . "\n";
     }
 
+    $link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket, false);
+    mysqli_report(MYSQLI_REPORT_ERROR|MYSQLI_REPORT_STRICT);
+    try {
+        mysqli_rollback($link);
+    } catch (\mysqli_sql_exception $e) {
+        echo $e->getMessage() . \PHP_EOL;
+    }
+
     print "done!\n";
 ?>
 --CLEAN--
@@ -61,4 +69,5 @@ require_once 'clean_table.inc';
 ?>
 --EXPECT--
 mysqli object is already closed
+There is no active transaction
 done!