From: Andrey Hristov <andrey@php.net>
Date: Fri, 8 Feb 2013 16:05:25 +0000 (+0100)
Subject: Add the constants needed for mysqli_commit(), _rollback() and
X-Git-Tag: php-5.5.0alpha5~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0da369ae5048185f8e5e26e0e89191de09da22cb;p=php

Add the constants needed for mysqli_commit(), _rollback() and
begin_transaction()
---

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 22e75cd998..1731bb70f4 100644
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -846,6 +846,16 @@ PHP_MINIT_FUNCTION(mysqli)
 	REGISTER_LONG_CONSTANT("MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT);
 #endif
 
+	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_START_WITH_CONSISTENT_SNAPSHOT", TRANS_START_WITH_CONSISTENT_SNAPSHOT, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_START_READ_WRITE", TRANS_START_READ_WRITE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_START_READ_ONLY", TRANS_START_READ_ONLY, CONST_CS | CONST_PERSISTENT);
+
+	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_AND_CHAIN", TRANS_COR_AND_CHAIN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_AND_NO_CHAIN", TRANS_COR_AND_NO_CHAIN, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_RELEASE", TRANS_COR_RELEASE, CONST_CS | CONST_PERSISTENT);
+	REGISTER_LONG_CONSTANT("MYSQLI_TRANS_COR_NO_RELEASE", TRANS_COR_NO_RELEASE, CONST_CS | CONST_PERSISTENT);
+
+
 #ifdef MYSQLI_USE_MYSQLND
 	mysqlnd_reverse_api_register_api(&mysqli_reverse_api TSRMLS_CC);
 #endif
diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 7c0f6a95e3..7c6dacd393 100644
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -32,7 +32,7 @@ require_once('skipifconnectfailure.inc');
 		"MYSQLI_ASSOC"						=> true,
 		"MYSQLI_NUM"						=> true,
 		"MYSQLI_BOTH"						=> true,
-		"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH"	=> true,
+		"MYSQLI_STMT_ATTR_UPDATE_MAX_LENGTH"=> true,
 		"MYSQLI_NOT_NULL_FLAG"				=> true,
 		"MYSQLI_PRI_KEY_FLAG"				=> true,
 		"MYSQLI_UNIQUE_KEY_FLAG"			=> true,
@@ -86,14 +86,21 @@ require_once('skipifconnectfailure.inc');
 		"MYSQLI_SET_CHARSET_NAME"			=> true,
 		"MYSQLI_SET_CHARSET_DIR"			=> true,
 		"MYSQLI_REFRESH_GRANT"				=> true,
-		"MYSQLI_REFRESH_LOG"					=> true,
+		"MYSQLI_REFRESH_LOG"				=> true,
 		"MYSQLI_REFRESH_TABLES"				=> true,
 		"MYSQLI_REFRESH_HOSTS"				=> true,
 		"MYSQLI_REFRESH_STATUS"				=> true,
 		"MYSQLI_REFRESH_THREADS"			=> true,
 		"MYSQLI_REFRESH_SLAVE"				=> true,
 		"MYSQLI_REFRESH_MASTER"				=> true,
-		"MYSQLI_DEBUG_TRACE_ENABLED"	=> true,
+		"MYSQLI_DEBUG_TRACE_ENABLED"		=> true,
+		"MYSQLI_TRANS_START_WITH_CONSISTENT_SNAPSHOT" => true,
+		"MYSQLI_TRANS_START_READ_WRITE"		=> true,
+		"MYSQLI_TRANS_START_READ_ONLY"		=> true,
+		"MYSQLI_TRANS_COR_AND_CHAIN"		=> true,
+		"MYSQLI_TRANS_COR_AND_NO_CHAIN"		=> true,
+		"MYSQLI_TRANS_COR_RELEASE"			=> true,
+		"MYSQLI_TRANS_COR_NO_RELEASE"		=> true,
 	);
 
 	/* depends on the build - experimental */