From: uwendel
Date: February 11 2008 3:36pm
Subject: PHP mysqlnd svn commit: r1268 - in trunk: mysqlnd php5/ext/mysqli php6/ext/mysqli tests/ext/mysqli
List-Archive: http://lists.mysql.com/commits/42040
Message-Id: <200802111536.m1BFaPxx006338@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: uwendel
Date: 2008-02-11 16:36:25 +0100 (Mon, 11 Feb 2008)
New Revision: 1268

Modified:
   trunk/mysqlnd/mysqlnd_enum_n_def.h
   trunk/php5/ext/mysqli/mysqli.c
   trunk/php6/ext/mysqli/mysqli.c
   trunk/tests/ext/mysqli/mysqli_constants.phpt
Log:
Adding new constants to make mysqli_fetch_field_flags.phpt pass.
Adding ON_UPDATE_NOW_FLAG, http://bugs.mysql.com/bug.php?id=30081


Modified: trunk/mysqlnd/mysqlnd_enum_n_def.h
===================================================================
--- trunk/mysqlnd/mysqlnd_enum_n_def.h	2008-02-11 14:47:09 UTC (rev 1267)
+++ trunk/mysqlnd/mysqlnd_enum_n_def.h	2008-02-11 15:36:25 UTC (rev 1268)
@@ -210,6 +210,7 @@
 #define TIMESTAMP_FLAG			 1024
 #define SET_FLAG				 2048
 #define NO_DEFAULT_VALUE_FLAG	 4096
+#define ON_UPDATE_NOW_FLAG		 8192
 #define PART_KEY_FLAG			16384
 #define GROUP_FLAG				32768
 #define NUM_FLAG				32768

Modified: trunk/php5/ext/mysqli/mysqli.c
===================================================================
--- trunk/php5/ext/mysqli/mysqli.c	2008-02-11 14:47:09 UTC (rev 1267)
+++ trunk/php5/ext/mysqli/mysqli.c	2008-02-11 15:36:25 UTC (rev 1268)
@@ -728,7 +728,14 @@
 	REGISTER_LONG_CONSTANT("MYSQLI_NUM_FLAG", NUM_FLAG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_PART_KEY_FLAG", PART_KEY_FLAG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_GROUP_FLAG", GROUP_FLAG, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("MYSQLI_ENUM_FLAG", ENUM_FLAG, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("MYSQLI_BINARY_FLAG", BINARY_FLAG, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("MYSQLI_NO_DEFAULT_VALUE_FLAG", NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
 
+#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 60000) || (MYSQLI_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
+	REGISTER_LONG_CONSTANT("MYSQLI_ON_UPDATE_NOW_FLAG", ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT);
+#endif
+
 	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DECIMAL", FIELD_TYPE_DECIMAL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TINY", FIELD_TYPE_TINY, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_SHORT", FIELD_TYPE_SHORT, CONST_CS | CONST_PERSISTENT);

Modified: trunk/php6/ext/mysqli/mysqli.c
===================================================================
--- trunk/php6/ext/mysqli/mysqli.c	2008-02-11 14:47:09 UTC (rev 1267)
+++ trunk/php6/ext/mysqli/mysqli.c	2008-02-11 15:36:25 UTC (rev 1268)
@@ -725,7 +725,14 @@
 	REGISTER_LONG_CONSTANT("MYSQLI_NUM_FLAG", NUM_FLAG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_PART_KEY_FLAG", PART_KEY_FLAG, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_GROUP_FLAG", GROUP_FLAG, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("MYSQLI_ENUM_FLAG", ENUM_FLAG, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("MYSQLI_BINARY_FLAG", BINARY_FLAG, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("MYSQLI_NO_DEFAULT_VALUE_FLAG", NO_DEFAULT_VALUE_FLAG, CONST_CS | CONST_PERSISTENT);
 
+#if (MYSQL_VERSION_ID > 51122 && MYSQL_VERSION_ID < 60000) || (MYSQLI_VERSION_ID > 60003) || defined(HAVE_MYSQLND)
+	REGISTER_LONG_CONSTANT("MYSQLI_ON_UPDATE_NOW_FLAG", ON_UPDATE_NOW_FLAG, CONST_CS | CONST_PERSISTENT);
+#endif
+
 	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_DECIMAL", FIELD_TYPE_DECIMAL, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_TINY", FIELD_TYPE_TINY, CONST_CS | CONST_PERSISTENT);
 	REGISTER_LONG_CONSTANT("MYSQLI_TYPE_SHORT", FIELD_TYPE_SHORT, CONST_CS | CONST_PERSISTENT);

Modified: trunk/tests/ext/mysqli/mysqli_constants.phpt
===================================================================
--- trunk/tests/ext/mysqli/mysqli_constants.phpt	2008-02-11 14:47:09 UTC (rev 1267)
+++ trunk/tests/ext/mysqli/mysqli_constants.phpt	2008-02-11 15:36:25 UTC (rev 1268)
@@ -133,7 +133,22 @@
 		$expected_constants["MYSQLI_RPL_ADMIN"]		= true;
 	}
 
+	/* TODO - a bit of a hack */
+	if (defined("MYSQLI_ENUM_FLAG"))
+		$expected_constants["MYSQLI_ENUM_FLAG"] = true;
 
+	if (defined("MYSQLI_BINARY_FLAG"))
+		$expected_constants["MYSQLI_BINARY_FLAG"] = true;
+
+	if (defined("MYSQLI_NO_DEFAULT_VALUE_FLAG"))
+		$expected_constants["MYSQLI_NO_DEFAULT_VALUE_FLAG"] = true;
+
+	if (defined("MYSQLI_ON_UPDATE_NOW_FLAG"))
+		$expected_constants["MYSQLI_ON_UPDATE_NOW_FLAG"] = true;
+
+	if (defined("MYSQLI_ASYNC"))
+		$expected_constants["MYSQLI_ASYNC"] = true;
+
 	$unexpected_constants = array();
 
 	foreach ($constants as $group => $consts) {