Annother attempt at fixing the mysqli_fetch_field tests

Instead of character set detection (which doesn't always work correctly)
fetch the character set info using mysqli_get_charset(). To make sure that
the returned info applies to all of client, connection and result
explicitely set utf8 as charset using mysqli_set_charset() before. I'm not
sure whether that last part is really necessary, but included it to be
safe.

1 files changed, 0 insertions, 93 deletions

diff --git a/ext/mysqli/tests/connect.inc b/ext/mysqli/tests/connect.inc
index 3a9d8ec258..4acc20cb91 100644
--- a/ext/mysqli/tests/connect.inc
+++ b/ext/mysqli/tests/connect.inc
@@ -129,99 +129,6 @@
 			}
 		}
 
-		function my_get_charsets($link) {
-
-			/* Those tree are set by SET NAMES */
-			$charsets = array(
-				'client' 		=> NULL,
-				'results'		=> NULL,
-				'connection'	=> NULL,
-			);
-
-			if (!($res = mysqli_query($link, "SHOW VARIABLES LIKE '%character%'"))) {
-				printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
-				return $charsets;
-			}
-
-			$names = array();
-			while ($row = mysqli_fetch_assoc($res)) {
-				$names[$row['Variable_name']] = $row['Value'];
-			}
-			mysqli_free_result($res);
-
-			if (!($res = mysqli_query($link, sprintf("SHOW CHARACTER SET LIKE '%s'", $names['character_set_client']))) ||
-				!($details = mysqli_fetch_assoc($res))) {
-				printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
-				return $charsets;
-			}
-			mysqli_free_result($res);
-
-			$charsets['client'] = array(
-				'charset' 	=> $details['Charset'],
-				'desc'		=> $details['Description'],
-				'collation'	=> $details['Default collation'],
-				'maxlen'	=> $details['Maxlen'],
-				'nr'		=> NULL,
-			);
-
-			if (!($res = mysqli_query($link, sprintf("SHOW COLLATION LIKE '%s'", $details['Default collation']))) ||
-				!($collation = mysqli_fetch_assoc($res))) {
-				printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
-				return $charsets;
-			}
-			mysqli_free_result($res);
-			$charsets['client']['nr'] = $collation['Id'];
-
-			if (!($res = mysqli_query($link, sprintf("SHOW CHARACTER SET LIKE '%s'", $names['character_set_results']))) ||
-				!($details = mysqli_fetch_assoc($res))) {
-				printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
-				return $charsets;
-			}
-			mysqli_free_result($res);
-
-			$charsets['results'] = array(
-				'charset' 	=> $details['Charset'],
-				'desc'		=> $details['Description'],
-				'collation'	=> $details['Default collation'],
-				'maxlen'	=> $details['Maxlen'],
-				'nr'		=> NULL,
-			);
-
-			if (!($res = mysqli_query($link, sprintf("SHOW COLLATION LIKE '%s'", $details['Default collation']))) ||
-				!($collation = mysqli_fetch_assoc($res))) {
-				printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
-				return $charsets;
-			}
-			mysqli_free_result($res);
-			$charsets['results']['nr'] = $collation['Id'];
-
-
-			if (!($res = mysqli_query($link, sprintf("SHOW CHARACTER SET LIKE '%s'", $names['character_set_connection']))) ||
-				!($details = mysqli_fetch_assoc($res))) {
-				printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
-				return $charsets;
-			}
-			mysqli_free_result($res);
-
-			$charsets['connection'] = array(
-				'charset' 	=> $details['Charset'],
-				'desc'		=> $details['Description'],
-				'collation'	=> $details['Default collation'],
-				'maxlen'	=> $details['Maxlen'],
-				'nr'		=> NULL,
-			);
-
-			if (!($res = mysqli_query($link, sprintf("SHOW COLLATION LIKE '%s'", $details['Default collation']))) ||
-				!($collation = mysqli_fetch_assoc($res))) {
-				printf("[%d] %s\n", mysqli_errno($link), mysqli_error($link));
-				return $charsets;
-			}
-			mysqli_free_result($res);
-			$charsets['connection']['nr'] = $collation['Id'];
-
-			return $charsets;
-		}
-
 		function have_innodb($link) {
 		  if (($res = $link->query("SHOW VARIABLES LIKE 'have_innodb'")) &&
 				($row = $res->fetch_row()) &&