com php-src: Revert "Try to fix mysqli_field tests": ext/mysqli/tests/table.inc
| From: | Nikita Popov | Date: | Thu, 16 Aug 2012 19:56:48 +0000 |
| Subject: | com php-src: Revert "Try to fix mysqli_field tests": ext/mysqli/tests/table.inc | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69858@lists.php.net to get a copy of this message | ||
Commit: 8cccc5c37d0113a0560410435126cb3032dd22a7
Author: Nikita Popov <nikic@php.net> Thu, 16 Aug 2012 21:30:58 +0200
Parents: 2118ab9ab4cb4ea8b473852559b0914347992767
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8cccc5c37d0113a0560410435126cb3032dd22a7
Log:
Revert "Try to fix mysqli_field tests"
This reverts commit 018395efafeb8cbce0b8864ca4a1eac232db1cbb.
This change didn't really make sense in hindsight. Looking for some other
fix.
Changed paths:
M ext/mysqli/tests/table.inc
Diff:
diff --git a/ext/mysqli/tests/table.inc b/ext/mysqli/tests/table.inc
index 2700c5a..aa1207a 100644
--- a/ext/mysqli/tests/table.inc
+++ b/ext/mysqli/tests/table.inc
@@ -12,7 +12,7 @@ if (!mysqli_query($link, 'DROP TABLE IF EXISTS test')) {
exit(1);
}
-if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1) COLLATE utf8_general_ci,
PRIMARY KEY(id)) ENGINE=' . $engine)) {
+if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1), PRIMARY KEY(id))
ENGINE=' . $engine)) {
printf("Failed to create test table: [%d] %s\n", mysqli_errno($link),
mysqli_error($link));
exit(1);
}
@@ -20,4 +20,4 @@ if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1) COLLATE
utf8_g
if (!mysqli_query($link, "INSERT INTO test(id, label) VALUES (1, 'a'), (2,
'b'), (3, 'c'), (4, 'd'), (5, 'e'), (6,
'f')")) {
printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
}
-?>
+?>
\ No newline at end of file