From: Nikita Popov <nikic@php.net>
Date: Wed, 15 Aug 2012 12:47:00 +0000 (+0200)
Subject: Try to fix mysqli_field tests
X-Git-Tag: php-5.5.0alpha1~20^2~74
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=018395efafeb8cbce0b8864ca4a1eac232db1cbb;p=php

Try to fix mysqli_field tests

Those tests seem to fail when people have a different default collation, so
try to fix by specifying utf8_general_ci explicitely.
---

diff --git a/ext/mysqli/tests/table.inc b/ext/mysqli/tests/table.inc
index aa1207af44..2700c5a5e2 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), PRIMARY KEY(id)) ENGINE=' . $engine)) {
+if (!mysqli_query($link, 'CREATE TABLE test(id INT, label CHAR(1) COLLATE utf8_general_ci, 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), PRIMARY KEY(i
 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
+?>