List:Commits« Previous MessageNext Message »
From:John H. Embretsen Date:January 12 2011 3:34pm
Subject:bzr commit into mysql-5.5 branch (john.embretsen:3241) Bug#45730 WL#1324
View as plain text  
#At file:///export/home/tmp/je159969/mysql-dev/bzr-repos/mysql-5.5-bug45730/ based on revid:holyfoot@stripped10112131131-72rcqbv2vvs2etli

 3241 John H. Embretsen	2011-01-12
      Fix for Bug#45730 - Test case disabled in show_check.test due to WL#1324.
      Enabled test snippet for bug 4374, tested on Mac OS X 10.6 as well as Solaris.
      Moved test snippet to a different place in the file, in order to avoid having 
      to save and restore "SET NAMES" setting. New surroundings expect latin1, as is 
      used in the testsnippet.
      
      An extra copy of the commented test snippet is removed, a comment is added,
      SQL keywords are converted to uppercase, and engine name "heap" is updated to 
      "Memory".
      
      Also added Copyright statement and a notice about the file's encoding(s).

    modified:
      mysql-test/r/show_check.result
      mysql-test/t/show_check.test
=== modified file 'mysql-test/r/show_check.result'
--- a/mysql-test/r/show_check.result	2010-11-30 17:53:11 +0000
+++ b/mysql-test/r/show_check.result	2011-01-12 15:34:42 +0000
@@ -1325,6 +1325,17 @@ Tables_in_test	Table_type
 ��t��	BASE TABLE
 drop table `��t��`;
 set names latin1;
+#
+# Bug#4374 SHOW TABLE STATUS FROM ignores collation_connection
+# Character set: Latin-1 (ISO-8859-1)
+#
+SET NAMES latin1;
+CREATE DATABASE `�`;
+CREATE TABLE `�`.`�` (a int) ENGINE=Memory;
+SHOW TABLE STATUS FROM `�` LIKE '�';
+Name	Engine	Version	Row_format	Rows	Avg_row_length	Data_length	Max_data_length	Index_length	Data_free	Auto_increment	Create_time	Update_time	Check_time	Collation	Checksum	Create_options	Comment
+�	MEMORY	10	Fixed	0	8	#	#	#	0	NULL	NULL	NULL	NULL	latin1_swedish_ci	NULL		
+DROP DATABASE `�`;
 show columns from `#mysql50#????????`;
 Got one of the listed errors
 DROP TABLE IF EXISTS t1;

=== modified file 'mysql-test/t/show_check.test'
--- a/mysql-test/t/show_check.test	2011-01-07 13:37:46 +0000
+++ b/mysql-test/t/show_check.test	2011-01-12 15:34:42 +0000
@@ -1,3 +1,33 @@
+# Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 2 of
+# the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+# 02110-1301  USA
+#
+
+################################################################################
+#
+# NOTICE:
+#
+#  This file unfortunately contains characters in various different encodings. 
+#  Be careful when editing this file to ensure that you (or your editor) do
+#  not change things (such as encodings) on lines that you did not mean to 
+#  modify.
+#
+################################################################################
+
+
 # Uses GRANT commands that usually disabled in embedded server
 -- source include/not_embedded.inc
 
@@ -223,14 +253,6 @@ CREATE TABLE """a" (i INT);
 SHOW CREATE TABLE """a";
 DROP TABLE """a";
 
-# Bug#4374 SHOW TABLE STATUS FROM ignores collation_connection
-#set names latin1;
-#create database `�`;
-#create table `�`.`�` (a int) engine=heap;
-#--replace_column 7 # 8 # 9 #
-#show table status from `�` LIKE '�';
-#drop database `�`;
-
 # to test quotes around keywords.. :
 
 SET sql_mode= '';
@@ -362,15 +384,6 @@ delete from mysql.db
 where user='mysqltest_1' || user='mysqltest_2' || user='mysqltest_3';
 flush privileges;
 
-# This test fails on MAC OSX, so it is temporary disabled.
-# This needs WL#1324 to be done.
-#set names latin1;
-#create database `�`;
-#create table `�`.`�` (a int) engine=heap;
-#--replace_column 7 # 8 # 9 #
-#show table status from `�` LIKE '�';
-#drop database `�`;
-
 # Test that USING <keytype> is always shown in SHOW CREATE TABLE when it was
 # specified during table creation, but not otherwise. (Bug#7235)
 CREATE TABLE t1 (i int, KEY (i)) ENGINE=MEMORY;
@@ -1053,6 +1066,17 @@ show full tables;
 drop table `��t��`;
 set names latin1;
 
+--echo #
+--echo # Bug#4374 SHOW TABLE STATUS FROM ignores collation_connection
+--echo # Character set: Latin-1 (ISO-8859-1)
+--echo #
+SET NAMES latin1;
+CREATE DATABASE `replace_column 7 # 8 # 9 #
+SHOW TABLE STATUS FROM `�` LIKE '�';
+DROP DATABASE `�`;
+
 #
 # Bug#26402 Server crashes with old-style named table
 #

Attachment: [text/bzr-bundle] bzr/john.embretsen@oracle.com-20110112153442-3i5shx63i7gk2sal.bundle
Thread
bzr commit into mysql-5.5 branch (john.embretsen:3241) Bug#45730 WL#1324John H. Embretsen12 Jan