From: Andrey Hristov <andrey@php.net>
Date: Mon, 16 Aug 2010 16:13:55 +0000 (+0000)
Subject: detect easily which charset doesn't work
X-Git-Tag: php-5.3.4RC1~346
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d72dba3018222cbe2c2ae0903a59eabc445c4d1;p=php

detect easily which charset doesn't work
---

diff --git a/ext/mysqli/tests/mysqli_character_set.phpt b/ext/mysqli/tests/mysqli_character_set.phpt
index 1fced9a3c4..5ca264a369 100644
--- a/ext/mysqli/tests/mysqli_character_set.phpt
+++ b/ext/mysqli/tests/mysqli_character_set.phpt
@@ -44,23 +44,24 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
 		$charsets[] = $row;
 	mysqli_free_result($res);
 
-	foreach ($charsets as $k => $charset) {
+	foreach ($charsets as $charset) {
+		$k = $charset['Charset'];
 		/* The server currently 17.07.2007 can't handle data sent in ucs2 */
 		if ($charset['Charset'] == 'ucs2') {
 			continue;
 		}
 
 		if (!mysqli_query($link, "DROP TABLE IF EXISTS test"))
-			printf("[006 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
+			printf("[006 + %s] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
 
 		$sql = sprintf("CREATE TABLE test(id INT, label CHAR(1)) CHARACTER SET '%s' ", $charset['Charset']);
 		if (!mysqli_query($link, $sql)) {
-			printf("[007 + %d] %s [%d] %s\n", $k, $sql, mysqli_errno($link), mysqli_error($link));
+			printf("[007 + %s] %s [%d] %s\n", $k, $sql, mysqli_errno($link), mysqli_error($link));
 			continue;
 		}
 
 		if (!mysqli_set_charset($link, $charset['Charset'])) {
-			printf("[008 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
+			printf("[008 + %s] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
 			continue;
 		}
 
@@ -69,26 +70,26 @@ if (version_compare(PHP_VERSION, '5.9.9', '>') == 1) {
 								$i, mysqli_real_escape_string($link, chr(ord("a") + $i)))))
 			{
 				var_dump($charset['Charset']);
-				printf("[009 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
+				printf("[009 + %s] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
 				continue;
 			}
 		}
 
 		if (!$res = mysqli_query($link, "SELECT id, label FROM test"))
-			printf("[010 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
+			printf("[010 + %s] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
 
 		for ($i = 1; $i <= 3; $i++) {
 
 			if (!$tmp = mysqli_fetch_assoc($res))
-				printf("[011 + %d] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
+				printf("[011 + %s] [%d] %s\n", $k, mysqli_errno($link), mysqli_error($link));
 
 			if ($tmp['id'] != $i)
-				printf("[012 + %d] Expecting %d, got %s, [%d] %s\n", $k,
+				printf("[012 + %s] Expecting %d, got %s, [%d] %s\n", $k,
 						$i, $tmp['id'],
 						mysqli_errno($link), mysqli_error($link));
 
 			if ($tmp['label'] != chr(ord("a") + $i))
-				printf("[013 + %d] Expecting %d, got %s, [%d] %s\n", $k,
+				printf("[013 + %s] Expecting %d, got %s, [%d] %s\n", $k,
 					chr(ord("a") + $i), $tmp['label'],
 					mysqli_errno($link), mysqli_error($link));