From: Ulf Wendel <uw@php.net>
Date: Fri, 2 Sep 2011 10:38:51 +0000 (+0000)
Subject: As of MySQL 5.6.1 the server variable have_innodb is no more. Updating InnoDB check...
X-Git-Tag: php-5.3.9RC1~269
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=248a9a7f4da44d2cb491dc1025bda66287594c6b;p=php

As of MySQL 5.6.1 the server variable have_innodb is no more. Updating InnoDB check...
---

diff --git a/ext/mysqli/tests/014.phpt b/ext/mysqli/tests/014.phpt
index 8fb8cceef6..da6a0052cc 100644
--- a/ext/mysqli/tests/014.phpt
+++ b/ext/mysqli/tests/014.phpt
@@ -5,19 +5,13 @@ mysqli autocommit/commit/rollback
 	require_once('skipif.inc');
 	require_once('skipifconnectfailure.inc');
 	require_once("connect.inc");
+
 	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
-	if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
-		die("skip Cannot check for required InnoDB suppot");
-	}
-	if (!$row = mysqli_fetch_row($result))
-		die("skip Cannot check for required InnoDB suppot");
+	if (!$link)
+		die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-	mysqli_free_result($result);
-	mysqli_close($link);
-	if ($row[1] == "DISABLED" || $row[1] == "NO") {
-		printf ("skip innodb support is not installed or enabled.");
-		exit;
-	}
+	if (!have_innodb($link))
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index c4f693ff12..c671ad68ff 100644
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -4,17 +4,13 @@ mysqli autocommit/commit/rollback with innodb
 <?php
 	require_once('skipif.inc');
 	require_once('skipifconnectfailure.inc');
-	require_once("connect.inc");
-	$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
-	$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'");
-	$row = mysqli_fetch_row($result);
-	mysqli_free_result($result);
-	mysqli_close($link);
 
-	if ($row[1] == "DISABLED" || $row[1] == "NO") {
-		printf ("skip innodb support is not installed or enabled.");
-		exit;
-	}
+	require_once('connect.inc');
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+		die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+	if (!have_innodb($link))
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index 6c6c48b5fc..ec837d64b3 100644
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -222,7 +222,47 @@
 			return $charsets;
 		}
 
+		function have_innodb($link) {
+		  if ($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'") &&
+				$row = $res->fetch_row() &&
+				!empty($row)) {
+				if ($row[1] == "DISABLED" || $row[1] == "NO") {
+					return false;
+				}
+				return true;
+		  } else {
+				/* MySQL 5.6.1+ */
+				if ($res = $link->query("SHOW ENGINES")) {
+					while ($row = $res->fetch_assoc()) {
+						if (('InnoDB' == $row['Engine']) && ('YES' == $row['Support'])) {
+							return true;
+						}
+					}
+					return false;
+				} else {
+					return false;
+				}
+		  }
+		  return false;
+		}
+
 	} else {
 		printf("skip Eeeek/BUG/FIXME - connect.inc included twice! skipif bug?\n");
 	}
-?>
\ No newline at end of file
+
+	function handle_catchable_fatal($errno, $error, $file, $line) {
+		static $errcodes = array();
+		if (empty($errcodes)) {
+			$constants = get_defined_constants();
+			foreach ($constants as $name => $value) {
+				if (substr($name, 0, 2) == "E_")
+					$errcodes[$value] = $name;
+			}
+		}
+		printf("[%s] %s in %s on line %s\n",
+			(isset($errcodes[$errno])) ? $errcodes[$errno] : $errno,
+			 $error, $file, $line);
+
+		return true;
+	}
+?>
diff --git a/ext/mysqli/tests/mysqli_autocommit.phpt b/ext/mysqli/tests/mysqli_autocommit.phpt
index f1f63e7f33..a93d89f101 100644
--- a/ext/mysqli/tests/mysqli_autocommit.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit.phpt
@@ -12,17 +12,8 @@ mysqli_autocommit()
 			$host, $user, $db, $port, $socket));
 	}
 
-	if (!$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
-		die("skip Cannot check for required InnoDB suppot");
-	}
-	if (!$row = mysqli_fetch_row($result))
-		die("skip Cannot check for required InnoDB suppot");
-
-	mysqli_free_result($result);
-	mysqli_close($link);
-	if ($row[1] == "DISABLED" || $row[1] == "NO") {
-		die(sprintf ("skip innodb support is not installed or enabled."));
-	}
+	if (!have_innodb($link))
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_autocommit_oo.phpt b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
index b1777b9f6a..c3be58bc3c 100644
--- a/ext/mysqli/tests/mysqli_autocommit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_autocommit_oo.phpt
@@ -13,19 +13,8 @@ mysqli->autocommit()
 		exit(1);
 	}
 
-	if (!$res = $mysqli->query("SHOW VARIABLES LIKE 'have_innodb'")) {
-		printf("skip Cannot fetch have_innodb variable\n");
-		exit(1);
-	}
-
-	$row = $res->fetch_row();
-	$res->free_result();
-	$mysqli->close();
-
-	if ($row[1] == "DISABLED" || $row[1] == "NO") {
-		printf ("skip Innodb support is not installed or enabled.");
-		exit(1);
-	}
+	if (!have_innodb($link))
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_change_user_rollback.phpt b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
index 97c2bd851c..ed3330e064 100644
--- a/ext/mysqli/tests/mysqli_change_user_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_change_user_rollback.phpt
@@ -6,16 +6,11 @@ require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 require_once('connect.inc');
-$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket);
-$result = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'");
-$row = mysqli_fetch_row($result);
-mysqli_free_result($result);
-mysqli_close($link);
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-if ($row[1] == "DISABLED" || $row[1] == "NO") {
-	printf ("skip innodb support is not installed or enabled.");
-	exit;
-}
+if (!have_innodb($link))
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_commit.phpt b/ext/mysqli/tests/mysqli_commit.phpt
index 66113b3a5f..d20ba5dd23 100644
--- a/ext/mysqli/tests/mysqli_commit.phpt
+++ b/ext/mysqli/tests/mysqli_commit.phpt
@@ -6,22 +6,12 @@ require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
 
-if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
-}
-
-if (!$res = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
-	die(sprintf("skip Cannot fetch have_innodb variable\n"));
-}
-
-$row = mysqli_fetch_row($res);
-mysqli_free_result($res);
-mysqli_close($link);
-
-if ($row[1] == "DISABLED" || $row[1] == "NO") {
-	die(sprintf ("skip Innodb support is not installed or enabled."));
-}
+require_once('connect.inc');
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+if (!have_innodb($link))
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_commit_oo.phpt b/ext/mysqli/tests/mysqli_commit_oo.phpt
index fee7967392..34ec4bfcdc 100644
--- a/ext/mysqli/tests/mysqli_commit_oo.phpt
+++ b/ext/mysqli/tests/mysqli_commit_oo.phpt
@@ -5,22 +5,13 @@ mysqli_commit()
 require_once('skipif.inc');
 require_once('skipifemb.inc');
 require_once('skipifconnectfailure.inc');
-if (!$mysqli = new my_mysqli($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
-}
-
-if (!$res = $mysqli->query("SHOW VARIABLES LIKE 'have_innodb'")) {
-	die(sprintf("skip Cannot fetch have_innodb variable\n"));
-}
-
-$row = $res->fetch_row();
-$res->free();
-$mysqli->close();
-
-if ($row[1] == "DISABLED" || $row[1] == "NO") {
-	die(sprintf("skip Innodb support is not installed or enabled."));
-}
+
+require_once('connect.inc');
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
+
+if (!have_innodb($link))
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_fork.phpt b/ext/mysqli/tests/mysqli_fork.phpt
index 6c5096f37a..f5a0b7bc95 100644
--- a/ext/mysqli/tests/mysqli_fork.phpt
+++ b/ext/mysqli/tests/mysqli_fork.phpt
@@ -13,22 +13,11 @@ if (!function_exists('posix_getpid'))
 	die("skip POSIX functions not available");
 
 require_once('connect.inc');
-if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-	die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-		$host, $user, $db, $port, $socket));
-}
-
-if (!$res = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
-	die(sprintf("skip Cannot fetch have_innodb variable\n"));
-}
-
-$row = mysqli_fetch_row($res);
-mysqli_free_result($res);
-mysqli_close($link);
+if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+	die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-if ($row[1] == "DISABLED" || $row[1] == "NO") {
-	die(sprintf ("skip Innodb support is not installed or enabled."));
-}
+if (!have_innodb($link))
+	die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php
diff --git a/ext/mysqli/tests/mysqli_rollback.phpt b/ext/mysqli/tests/mysqli_rollback.phpt
index 1b1fe8b356..be49000315 100644
--- a/ext/mysqli/tests/mysqli_rollback.phpt
+++ b/ext/mysqli/tests/mysqli_rollback.phpt
@@ -9,23 +9,11 @@ mysqli_rollback()
 	require_once('skipifconnectfailure.inc');
 
 	require_once('connect.inc');
+	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket))
+		die(sprintf("Cannot connect, [%d] %s", mysqli_connect_errno(), mysqli_connect_error()));
 
-	if (!$link = my_mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
-		die(sprintf("skip Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
-			$host, $user, $db, $port, $socket));
-	}
-
-	if (!$res = mysqli_query($link, "SHOW VARIABLES LIKE 'have_innodb'")) {
-		die(sprintf("skip Cannot fetch have_innodb variable\n"));
-	}
-
-	$row = mysqli_fetch_row($res);
-	mysqli_free_result($res);
-	mysqli_close($link);
-
-	if ($row[1] == "DISABLED" || $row[1] == "NO") {
-		die(sprintf("skip Innodb support is not installed or enabled."));
-	}
+	if (!have_innodb($link))
+		die(sprintf("Needs InnoDB support, [%d] %s", $link->errno, $link->error));
 ?>
 --FILE--
 <?php