summaryrefslogtreecommitdiff
path: root/ext/mysqli/tests/015.phpt
diff options
context:
space:
mode:
Diffstat (limited to 'ext/mysqli/tests/015.phpt')
-rw-r--r--ext/mysqli/tests/015.phpt41
1 files changed, 29 insertions, 12 deletions
diff --git a/ext/mysqli/tests/015.phpt b/ext/mysqli/tests/015.phpt
index 7620f3c435..f68e9aa72a 100644
--- a/ext/mysqli/tests/015.phpt
+++ b/ext/mysqli/tests/015.phpt
@@ -1,15 +1,16 @@
--TEST--
-mysqli autocommit/commit/rollback with myisam
+mysqli autocommit/commit/rollback with innodb
--SKIPIF--
-<?php
+<?php
require_once('skipif.inc');
+ require_once('skipifconnectfailure.inc');
include "connect.inc";
- $link = mysqli_connect($host, $user, $passwd);
+ $link = 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] == "NO") {
printf ("skip innodb support not installed.");
}
@@ -17,16 +18,16 @@ mysqli autocommit/commit/rollback with myisam
--FILE--
<?php
include "connect.inc";
-
- $link = mysqli_connect($host, $user, $passwd);
- mysqli_select_db($link, "test");
+ $link = mysqli_connect($host, $user, $passwd, $db, $port, $socket);
+
+ mysqli_select_db($link, $db);
mysqli_autocommit($link, TRUE);
mysqli_query($link,"DROP TABLE IF EXISTS ac_01");
- mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10))");
+ mysqli_query($link,"CREATE TABLE ac_01(a int, b varchar(10)) Engine=InnoDB");
mysqli_query($link, "INSERT INTO ac_01 VALUES (1, 'foobar')");
mysqli_autocommit($link, FALSE);
@@ -36,7 +37,7 @@ mysqli autocommit/commit/rollback with myisam
mysqli_rollback($link);
- $result = mysqli_query($link, "SELECT * FROM ac_01");
+ $result = mysqli_query($link, "SELECT SQL_NO_CACHE * FROM ac_01");
$row = mysqli_fetch_row($result);
mysqli_free_result($result);
@@ -53,13 +54,14 @@ mysqli autocommit/commit/rollback with myisam
var_dump($row);
mysqli_close($link);
+ print "done!";
?>
---EXPECT--
+--EXPECTF--
array(2) {
[0]=>
- string(1) "2"
+ string(1) "1"
[1]=>
- string(4) "egon"
+ string(6) "foobar"
}
array(2) {
[0]=>
@@ -67,3 +69,18 @@ array(2) {
[1]=>
string(4) "egon"
}
+done!
+--UEXPECTF--
+array(2) {
+ [0]=>
+ unicode(1) "1"
+ [1]=>
+ unicode(6) "foobar"
+}
+array(2) {
+ [0]=>
+ unicode(1) "2"
+ [1]=>
+ unicode(4) "egon"
+}
+done! \ No newline at end of file