mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Now table and database inhirited a character set from a level above at CREATE time
Some optimization to reduce rules number in sql_yacc.yy mysql-test/r/create.result: Now table and database inhirited a character set from a level above at CREATE time mysql-test/r/fulltext.result: Now table and database inhirited a character set from a level above at CREATE time mysql-test/r/innodb.result: Now table and database inhirited a character set from a level above at CREATE time mysql-test/r/merge.result: Now table and database inhirited a character set from a level above at CREATE time mysql-test/r/show_check.result: Now table and database inhirited a character set from a level above at CREATE time mysql-test/r/symlink.result: Now table and database inhirited a character set from a level above at CREATE time mysql-test/r/type_enum.result: Now table and database inhirited a character set from a level above at CREATE time mysql-test/r/type_set.result: Now table and database inhirited a character set from a level above at CREATE time sql/sql_yacc.yy: Now table and database inhirited a character set from a level above at CREATE time Some optimization to reduce rules number
This commit is contained in:
@ -174,7 +174,7 @@ t3 CREATE TABLE `t3` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` char(20) character set latin1 default NULL,
|
||||
KEY `a` (`a`)
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 UNION=(t1,t2)
|
||||
create table t4 (a int not null, b char(10), key(a)) type=MERGE UNION=(t1,t2);
|
||||
select * from t4;
|
||||
Can't open file: 't4.MRG'. (errno: 143)
|
||||
@ -249,14 +249,14 @@ t3 CREATE TABLE `t3` (
|
||||
`incr` int(11) NOT NULL default '0',
|
||||
`othr` int(11) NOT NULL default '0',
|
||||
PRIMARY KEY (`incr`)
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 UNION=(t1,t2)
|
||||
alter table t3 drop primary key;
|
||||
show create table t3;
|
||||
Table Create Table
|
||||
t3 CREATE TABLE `t3` (
|
||||
`incr` int(11) NOT NULL default '0',
|
||||
`othr` int(11) NOT NULL default '0'
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 UNION=(t1,t2)
|
||||
drop table t3,t2,t1;
|
||||
create table t1 (a int not null) type=merge;
|
||||
select * from t1;
|
||||
@ -287,28 +287,28 @@ t3 CREATE TABLE `t3` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` int(11) NOT NULL default '0',
|
||||
KEY `a` (`a`,`b`)
|
||||
) TYPE=MyISAM
|
||||
) TYPE=MyISAM CHARSET=latin1
|
||||
show create table t4;
|
||||
Table Create Table
|
||||
t4 CREATE TABLE `t4` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` int(11) NOT NULL default '0',
|
||||
KEY `a` (`a`,`b`)
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 UNION=(t1,t2)
|
||||
show create table t5;
|
||||
Table Create Table
|
||||
t5 CREATE TABLE `t5` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` int(11) NOT NULL default '0',
|
||||
KEY `a` (`a`,`b`)
|
||||
) TYPE=MRG_MyISAM INSERT_METHOD=FIRST UNION=(t1,t2)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 INSERT_METHOD=FIRST UNION=(t1,t2)
|
||||
show create table t6;
|
||||
Table Create Table
|
||||
t6 CREATE TABLE `t6` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` int(11) NOT NULL default '0',
|
||||
KEY `a` (`a`,`b`)
|
||||
) TYPE=MRG_MyISAM INSERT_METHOD=LAST UNION=(t1,t2)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 INSERT_METHOD=LAST UNION=(t1,t2)
|
||||
insert into t1 values (1,1),(1,2),(1,3),(1,4);
|
||||
insert into t2 values (2,1),(2,2),(2,3),(2,4);
|
||||
select * from t3 order by b,a limit 3;
|
||||
@ -373,7 +373,7 @@ t4 CREATE TABLE `t4` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` int(11) NOT NULL default '0',
|
||||
KEY `a` (`a`,`b`)
|
||||
) TYPE=MRG_MyISAM UNION=(t1,t2,t3)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 UNION=(t1,t2,t3)
|
||||
select * from t4 order by a,b;
|
||||
a b
|
||||
1 1
|
||||
@ -399,7 +399,7 @@ t4 CREATE TABLE `t4` (
|
||||
`a` int(11) NOT NULL default '0',
|
||||
`b` int(11) NOT NULL default '0',
|
||||
KEY `a` (`a`,`b`)
|
||||
) TYPE=MRG_MyISAM INSERT_METHOD=FIRST UNION=(t1,t2,t3)
|
||||
) TYPE=MRG_MyISAM CHARSET=latin1 INSERT_METHOD=FIRST UNION=(t1,t2,t3)
|
||||
insert into t4 values (4,1),(4,2);
|
||||
select * from t1 order by a,b;
|
||||
a b
|
||||
|
Reference in New Issue
Block a user