Merge mysql.com:/home/pem/work/mysql-4.1

into mysql.com:/home/pem/work/mysql-5.0-merge client/mysql.cc: Auto merged libmysql/libmysql.c: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/show_check.result: Auto merged sql/item.cc: Auto merged sql/mysql_priv.h: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged tests/client_test.c: Auto merged
2025-07-30 16:24:05 +03:00 · 2004-02-13 17:39:00 +01:00
parent b5c8de4c83 9a3a0d7d40
commit 078919ad9e
30 changed files with 642 additions and 478 deletions
--- a/mysql-test/r/cast.result
+++ b/mysql-test/r/cast.result
@ -64,12 +64,6 @@ test
 select cast(_koi8r'<27><><EFBFBD><EFBFBD>' as char character set cp1251);
 cast(_koi8r'<27><><EFBFBD><EFBFBD>' as char character set cp1251)
 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
-select convert(_latin1'test', "latin1_german1_ci", "latin1_swedish_ci");
-convert(_latin1'test', "latin1_german1_ci", "latin1_swedish_ci")
-test
-select convert(_koi8r'<27><><EFBFBD><EFBFBD>', "koi8r_general_ci", "cp1251_general_ci");
-convert(_koi8r'<27><><EFBFBD><EFBFBD>', "koi8r_general_ci", "cp1251_general_ci")
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD>
 create table t1 select cast(_koi8r'<27><><EFBFBD><EFBFBD>' as char character set cp1251) as t;
 show create table t1;
 Table	Create Table
--- a/mysql-test/r/ctype_many.result
+++ b/mysql-test/r/ctype_many.result
@ -340,129 +340,6 @@ CYR CAPIT SOFT SIGN
 CYR CAPIT E	<09>	<09>
 CYR CAPIT YU	<09>	<09>
 CYR CAPIT YA	<09>	<09>
-select CONVERT(koi8_ru_f, 'cp1251_general_ci', 'utf8_general_ci'), comment from t1;
-CONVERT(koi8_ru_f, 'cp1251_general_ci', 'utf8_general_ci')	comment
-a	LAT SMALL A
-b	LAT SMALL B
-c	LAT SMALL C
-d	LAT SMALL D
-e	LAT SMALL E
-f	LAT SMALL F
-g	LAT SMALL G
-h	LAT SMALL H
-i	LAT SMALL I
-j	LAT SMALL J
-k	LAT SMALL K
-l	LAT SMALL L
-m	LAT SMALL M
-n	LAT SMALL N
-o	LAT SMALL O
-p	LAT SMALL P
-q	LAT SMALL Q
-r	LAT SMALL R
-s	LAT SMALL S
-t	LAT SMALL T
-u	LAT SMALL U
-v	LAT SMALL V
-w	LAT SMALL W
-x	LAT SMALL X
-y	LAT SMALL Y
-z	LAT SMALL Z
-A	LAT CAPIT A
-B	LAT CAPIT B
-C	LAT CAPIT C
-D	LAT CAPIT D
-E	LAT CAPIT E
-F	LAT CAPIT F
-G	LAT CAPIT G
-H	LAT CAPIT H
-I	LAT CAPIT I
-J	LAT CAPIT J
-K	LAT CAPIT K
-L	LAT CAPIT L
-M	LAT CAPIT M
-N	LAT CAPIT N
-O	LAT CAPIT O
-P	LAT CAPIT P
-Q	LAT CAPIT Q
-R	LAT CAPIT R
-S	LAT CAPIT S
-T	LAT CAPIT T
-U	LAT CAPIT U
-V	LAT CAPIT V
-W	LAT CAPIT W
-X	LAT CAPIT X
-Y	LAT CAPIT Y
-Z	LAT CAPIT Z
-<EFBFBD>	CYR SMALL A
-<EFBFBD>	CYR SMALL BE
-<EFBFBD>	CYR SMALL VE
-<EFBFBD>	CYR SMALL GE
-<EFBFBD>	CYR SMALL DE
-<EFBFBD>	CYR SMALL IE
-?	CYR SMALL IO
-<EFBFBD>	CYR SMALL ZHE
-<EFBFBD>	CYR SMALL ZE
-<EFBFBD>	CYR SMALL I
-<EFBFBD>	CYR SMALL KA
-<EFBFBD>	CYR SMALL EL
-<EFBFBD>	CYR SMALL EM
-<EFBFBD>	CYR SMALL EN
-<EFBFBD>	CYR SMALL O
-<EFBFBD>	CYR SMALL PE
-<EFBFBD>	CYR SMALL ER
-<EFBFBD>	CYR SMALL ES
-<EFBFBD>	CYR SMALL TE
-<EFBFBD>	CYR SMALL U
-<EFBFBD>	CYR SMALL EF
-<EFBFBD>	CYR SMALL HA
-<EFBFBD>	CYR SMALL TSE
-<EFBFBD>	CYR SMALL CHE
-<EFBFBD>	CYR SMALL SHA
-<EFBFBD>	CYR SMALL SCHA
-<EFBFBD>	CYR SMALL HARD SIGN
-<EFBFBD>	CYR SMALL YERU
-<EFBFBD>	CYR SMALL SOFT SIGN
-<EFBFBD>	CYR SMALL E
-<EFBFBD>	CYR SMALL YU
-<EFBFBD>	CYR SMALL YA
-<EFBFBD>	CYR CAPIT A
-<EFBFBD>	CYR CAPIT BE
-<EFBFBD>	CYR CAPIT VE
-<EFBFBD>	CYR CAPIT GE
-<EFBFBD>	CYR CAPIT DE
-<EFBFBD>	CYR CAPIT IE
-?	CYR CAPIT IO
-<EFBFBD>	CYR CAPIT ZHE
-<EFBFBD>	CYR CAPIT ZE
-<EFBFBD>	CYR CAPIT I
-<EFBFBD>	CYR CAPIT KA
-<EFBFBD>	CYR CAPIT EL
-<EFBFBD>	CYR CAPIT EM
-<EFBFBD>	CYR CAPIT EN
-<EFBFBD>	CYR CAPIT O
-<EFBFBD>	CYR CAPIT PE
-<EFBFBD>	CYR CAPIT ER
-<EFBFBD>	CYR CAPIT ES
-<EFBFBD>	CYR CAPIT TE
-<EFBFBD>	CYR CAPIT U
-<EFBFBD>	CYR CAPIT EF
-<EFBFBD>	CYR CAPIT HA
-<EFBFBD>	CYR CAPIT TSE
-<EFBFBD>	CYR CAPIT CHE
-<EFBFBD>	CYR CAPIT SHA
-<EFBFBD>	CYR CAPIT SCHA
-<EFBFBD>	CYR CAPIT HARD SIGN
-<EFBFBD>	CYR CAPIT YERU
-<EFBFBD>	CYR CAPIT SOFT SIGN
-<EFBFBD>	CYR CAPIT E
-<EFBFBD>	CYR CAPIT YU
-<EFBFBD>	CYR CAPIT YA
-explain extended select CONVERT(koi8_ru_f, 'cp1251_general_ci', 'utf8_general_ci'), comment from t1;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	116	
-Warnings:
-Note	1003	select high_priority convert(test.t1.koi8_ru_f,_latin1'utf8_general_ci',_latin1'cp1251_general_ci') AS `CONVERT(koi8_ru_f, 'cp1251_general_ci', 'utf8_general_ci')`,test.t1.comment AS `comment` from test.t1
 ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL;
 UPDATE t1 SET bin_f=koi8_ru_f;
 SELECT COUNT(DISTINCT bin_f),COUNT(DISTINCT koi8_ru_f),COUNT(DISTINCT utf8_f) FROM t1;
--- a/mysql-test/r/ctype_utf8.result
+++ b/mysql-test/r/ctype_utf8.result
@ -167,3 +167,5 @@ select hex(s1) from t1;
 hex(s1)
 41
 drop table t1;
+create table t1 (a char(160) character set utf8, primary key(a));
+ERROR HY000: Incorrect sub part key. The used key part isn't a string, the used length is longer than the key part or the storage engine doesn't support unique sub keys
--- a/mysql-test/r/func_system.result
+++ b/mysql-test/r/func_system.result
@ -51,6 +51,20 @@ t1	CREATE TABLE `t1` (
  `version` char(40) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+select charset(charset(_utf8'a')), charset(collation(_utf8'a'));
+charset(charset(_utf8'a'))	charset(collation(_utf8'a'))
+utf8	utf8
+select collation(charset(_utf8'a')), collation(collation(_utf8'a'));
+collation(charset(_utf8'a'))	collation(collation(_utf8'a'))
+utf8_general_ci	utf8_general_ci
+create table t1 select charset(_utf8'a'), collation(_utf8'a');
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `charset(_utf8'a')` char(64) character set utf8 NOT NULL default '',
+  `collation(_utf8'a')` char(64) character set utf8 NOT NULL default ''
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+drop table t1;
 select TRUE,FALSE,NULL;
 TRUE	FALSE	NULL
 1	0	NULL
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@ -186,7 +186,7 @@ create table ```a` (i int);
 /*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
 /*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE=NO_AUTO_VALUE_ON_ZERO */;
 DROP TABLE IF EXISTS ```a`;
-CREATE TABLE ``a` (
+CREATE TABLE ```a` (
  `i` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;

--- a/mysql-test/r/show_check.result
+++ b/mysql-test/r/show_check.result
@ -266,3 +266,51 @@ c	decimal(4,3)	YES		NULL
 d	double(4,3)	YES		NULL	
 f	float(4,3)	YES		NULL	
 drop table t1;
+SET sql_mode='';
+SET sql_quote_show_create=OFF;
+CREATE TABLE ```ab``cd``` (i INT);
+SHOW CREATE TABLE ```ab``cd```;
+Table	Create Table
+`ab`cd`	CREATE TABLE ```ab``cd``` (
+  i int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE ```ab``cd```;
+CREATE TABLE ```ab````cd``` (i INT);
+SHOW CREATE TABLE ```ab````cd```;
+Table	Create Table
+`ab``cd`	CREATE TABLE ```ab````cd``` (
+  i int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE ```ab````cd```;
+CREATE TABLE ```a` (i INT);
+SHOW CREATE TABLE ```a`;
+Table	Create Table
+`a	CREATE TABLE ```a` (
+  i int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE ```a`;
+SET sql_mode='ANSI_QUOTES';
+CREATE TABLE """a" (i INT);
+SHOW CREATE TABLE """a";
+Table	Create Table
+"a	CREATE TABLE """a" (
+  i int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE """a";
+SET sql_mode='';
+SET sql_quote_show_create=OFF;
+CREATE TABLE t1 (i INT);
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE t1 (
+  i int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE t1;
+CREATE TABLE `table` (i INT);
+SHOW CREATE TABLE `table`;
+Table	Create Table
+table	CREATE TABLE `table` (
+  i int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+DROP TABLE `table`;
+SET sql_quote_show_create=ON;
--- a/mysql-test/t/cast.test
+++ b/mysql-test/t/cast.test
@ -28,8 +28,6 @@ select CAST(DATE "2004-01-22 21:45:33" AS CHAR(4) BINARY);
 set names binary;
 select cast(_latin1'test' as char character set latin2);
 select cast(_koi8r'<27><><EFBFBD><EFBFBD>' as char character set cp1251);
-select convert(_latin1'test', "latin1_german1_ci", "latin1_swedish_ci");
-select convert(_koi8r'<27><><EFBFBD><EFBFBD>', "koi8r_general_ci", "cp1251_general_ci");
 create table t1 select cast(_koi8r'<27><><EFBFBD><EFBFBD>' as char character set cp1251) as t;
 show create table t1;
 drop table t1;
--- a/mysql-test/t/ctype_many.test
+++ b/mysql-test/t/ctype_many.test
@ -147,11 +147,6 @@ UPDATE t1 SET utf8_f=CONVERT(koi8_ru_f USING utf8);
 SET CHARACTER SET koi8r;
 SELECT * FROM t1;

-#
-# codecovarage for Item_func_conv_charset3
-#
-select CONVERT(koi8_ru_f, 'cp1251_general_ci', 'utf8_general_ci'), comment from t1;
-explain extended select CONVERT(koi8_ru_f, 'cp1251_general_ci', 'utf8_general_ci'), comment from t1;

 ALTER TABLE t1 ADD bin_f CHAR(32) BYTE NOT NULL;
 UPDATE t1 SET bin_f=koi8_ru_f;
--- a/mysql-test/t/ctype_utf8.test
+++ b/mysql-test/t/ctype_utf8.test
@ -98,3 +98,10 @@ create table t1 (s1 text character set utf8);
 insert into t1 values (0x41FF);
 select hex(s1) from t1;
 drop table t1;
+
+#
+# Bug 2699
+# UTF8 breaks primary keys for cols > 85 characters
+#
+--error 1089
+create table t1 (a char(160) character set utf8, primary key(a));
--- a/mysql-test/t/func_system.test
+++ b/mysql-test/t/func_system.test
@ -23,4 +23,10 @@ create table t1 (version char(40)) select database(), user(), version() as 'vers
 show create table t1;
 drop table t1;

+select charset(charset(_utf8'a')), charset(collation(_utf8'a'));
+select collation(charset(_utf8'a')), collation(collation(_utf8'a'));
+create table t1 select charset(_utf8'a'), collation(_utf8'a');
+show create table t1;
+drop table t1;
+
 select TRUE,FALSE,NULL;
--- a/mysql-test/t/show_check.test
+++ b/mysql-test/t/show_check.test
@ -142,3 +142,43 @@ drop table t1;
 create table t1 (c decimal(3,3), d double(3,3), f float(3,3));
 show columns from t1;
 drop table t1;
+
+#
+# Test for Bug #2593 "SHOW CREATE TABLE doesn't properly double quotes"
+#
+
+SET sql_mode='';
+SET sql_quote_show_create=OFF;
+
+CREATE TABLE ```ab``cd``` (i INT);
+SHOW CREATE TABLE ```ab``cd```;
+DROP TABLE ```ab``cd```;
+
+CREATE TABLE ```ab````cd``` (i INT);
+SHOW CREATE TABLE ```ab````cd```;
+DROP TABLE ```ab````cd```;
+
+CREATE TABLE ```a` (i INT);
+SHOW CREATE TABLE ```a`;
+DROP TABLE ```a`;
+
+SET sql_mode='ANSI_QUOTES';
+
+CREATE TABLE """a" (i INT);
+SHOW CREATE TABLE """a";
+DROP TABLE """a";
+
+# to test quotes around keywords.. :
+
+SET sql_mode='';
+SET sql_quote_show_create=OFF;
+
+CREATE TABLE t1 (i INT);
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
+CREATE TABLE `table` (i INT);
+SHOW CREATE TABLE `table`;
+DROP TABLE `table`;
+
+SET sql_quote_show_create=ON;