mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
b388eb004d
bmove_allign -> bmove_align Added OLAP function ROLLUP Split mysql_fix_privilege_tables to a script and a .sql data file Added new (MEMROOT*) functions to avoid calling current_thd() when creating some common objects. Added table_alias_charset, for easier --lower-case-table-name handling Better SQL_MODE handling (Setting complex options also sets sub options) New (faster) assembler string functions for x86 BitKeeper/etc/ignore: added libmysqld/sql_state.c client/mysql.cc: Added SQLSTATE to error messages Added new function put_error() to be able to clean up some old code. client/mysqltest.c: Write ERROR SQLSTATE for all errors dbug/dbug.c: Portability fixes include/m_string.h: Rename bmove_allign as bmove_align include/mysql.h: Added SQLSTATE (for embedded version) include/mysql_com.h: Send correct SQLSTATE for the error to the client libmysql/libmysql.c: Changed default error state to HY000 Applied code cleanup patch libmysqld/Makefile.am: Added sql_state.cc libmysqld/libmysqld.c: Added sqlstate mysql-test/r/analyse.result: Updated results mysql-test/r/ansi.result: Updated results mysql-test/r/auto_increment.result: Updated results mysql-test/r/bdb-deadlock.result: Updated results mysql-test/r/bdb.result: Updated results mysql-test/r/comments.result: Updated results mysql-test/r/create.result: Updated results mysql-test/r/ctype_collate.result: Updated results mysql-test/r/delayed.result: Updated results mysql-test/r/delete.result: Updated results mysql-test/r/derived.result: Updated results mysql-test/r/distinct.result: Updated results mysql-test/r/drop.result: Updated results mysql-test/r/err000001.result: Updated results mysql-test/r/explain.result: Updated results mysql-test/r/flush.result: Updated results mysql-test/r/fulltext.result: Updated results mysql-test/r/func_gconcat.result: Updated results mysql-test/r/func_system.result: Updated results mysql-test/r/grant_cache.result: Updated results mysql-test/r/group_by.result: Updated results mysql-test/r/handler.result: Updated results mysql-test/r/heap.result: Updated results mysql-test/r/heap_btree.result: Updated results mysql-test/r/heap_hash.result: Updated results mysql-test/r/innodb.result: Updated results mysql-test/r/innodb_handler.result: Updated results mysql-test/r/insert_select.result: Updated results mysql-test/r/insert_update.result: Updated results mysql-test/r/join.result: Updated results mysql-test/r/join_outer.result: Updated results mysql-test/r/key.result: Updated results mysql-test/r/lock.result: Updated results mysql-test/r/lock_multi.result: Updated results mysql-test/r/merge.result: Updated results mysql-test/r/multi_update.result: Updated results mysql-test/r/myisam.result: Updated results mysql-test/r/null.result: Updated results mysql-test/r/olap.result: Updated results mysql-test/r/order_by.result: Updated results mysql-test/r/packet.result: Updated results mysql-test/r/query_cache.result: Updated results mysql-test/r/row.result: Updated results mysql-test/r/rpl000001.result: Updated results mysql-test/r/rpl000009.result: Updated results mysql-test/r/rpl_empty_master_crash.result: Updated results mysql-test/r/rpl_log.result: Updated results mysql-test/r/rpl_replicate_do.result: Updated results mysql-test/r/rpl_rotate_logs.result: Updated results mysql-test/r/select.result: Updated results mysql-test/r/select_safe.result: Updated results mysql-test/r/show_check.result: Updated results mysql-test/r/sql_mode.result: Updated results mysql-test/r/subselect.result: Updated results mysql-test/r/temp_table.result: Updated results mysql-test/r/truncate.result: Updated results mysql-test/r/type_blob.result: Updated results mysql-test/r/type_decimal.result: Updated results mysql-test/r/type_float.result: Updated results mysql-test/r/type_ranges.result: Updated results mysql-test/r/union.result: Updated results mysql-test/r/update.result: Updated results mysql-test/r/user_var.result: Updated results mysql-test/r/varbinary.result: Updated results mysql-test/r/variables.result: Updated results mysql-test/t/ansi.test: Test of sql_mode mysql-test/t/derived.test: Updated results mysql-test/t/func_system.test: Make this independen of the MySQL server name mysql-test/t/lowercase_table.test: Cleanup mysql-test/t/olap.test: A lot of new tests mysql-test/t/sql_mode.test: More test for sql_mode mysql-test/t/subselect.test: Added a few new tests (to find a bug in the item_ref code) scripts/Makefile.am: Added mysql_fix_privilege_tables.sql scripts/mysql_fix_privilege_tables.sh: Totally new script. This bascily just pipes mysql_fix_privilege_tables.sql through 'mysql' to 'mysqld' sql/Makefile.am: Added sql_state.cc sql/item.cc: Extended Item_field::eq() to be able to better match GROUP BY fields on the command line. Needed for ROLLUP sql/item.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/item_sum.cc: Moved copy_or_same() and some reset() functions from item_sum.h Needed to be able to access thd->mem_root. sql/item_sum.h: Moved some functions to item_sum.cc Added make_unique() for ROLLUP sql/item_uniq.h: Fixed return value sql/mysql_priv.h: Updated MODE flags sql/mysqld.cc: Added ANSI as it's own mode Moved charset_info variables here Cleaned up handler_count handling (for NT) Added table_alias_charset, for easier --lower-case-table-name handling sql/net_serv.cc: New comment sql/protocol.cc: Send SQLSTATE to client sql/set_var.cc: Better SQL_MODE handling (Setting complex options also sets sub options) sql/set_var.h: Better SQL_MODE handling sql/sql_base.cc: Make alias depend on --lower-case-table-names Make find_item_in_list also check database name sql/sql_cache.cc: Indentation cleanup sql/sql_list.h: Added safety assert Addes support of alloc without current_thd() sql/sql_prepare.cc: Update after prototype change sql/sql_select.cc: Added ROLLUP sql/sql_select.h: structures for rollup sql/sql_show.cc: Easier SQL_MODE handling sql/sql_string.cc: Move CHARSET_INFO to mysqld (to be together with all other global variables) sql/sql_string.h: Added function to be able to avoid calling current_thd() when doing new Item. sql/sql_table.cc: Simpler --lower-case-table-name handling sql/sql_union.cc: Update after prototype change sql/sql_yacc.yy: ROLLUP sql/unireg.h: bmove_allign ->bmove_align strings/Makefile.am: Fix to be able to compile str_test.c strings/ctype.c: Removed empty lines strings/str_test.c: Added test of bmove_align strings/strings-x86.s: Faster bmove_align, bmove_upp and strmake strings/strings.asm: move_allg
330 lines
11 KiB
Text
330 lines
11 KiB
Text
drop table if exists t1,t2,t3,t4,t5,t6;
|
|
CREATE TABLE t1 (a int not null, b char (10) not null);
|
|
insert into t1 values(1,'a'),(2,'b'),(3,'c'),(3,'c');
|
|
CREATE TABLE t2 (a int not null, b char (10) not null);
|
|
insert into t2 values (3,'c'),(4,'d'),(5,'f'),(6,'e');
|
|
select a,b from t1 union select a,b from t2;
|
|
a b
|
|
1 a
|
|
2 b
|
|
3 c
|
|
4 d
|
|
5 f
|
|
6 e
|
|
select a,b from t1 union all select a,b from t2;
|
|
a b
|
|
1 a
|
|
2 b
|
|
3 c
|
|
3 c
|
|
3 c
|
|
4 d
|
|
5 f
|
|
6 e
|
|
select a,b from t1 union all select a,b from t2 order by b;
|
|
a b
|
|
1 a
|
|
2 b
|
|
3 c
|
|
3 c
|
|
3 c
|
|
4 d
|
|
6 e
|
|
5 f
|
|
select a,b from t1 union all select a,b from t2 union select 7,'g';
|
|
a b
|
|
1 a
|
|
2 b
|
|
3 c
|
|
3 c
|
|
3 c
|
|
4 d
|
|
5 f
|
|
6 e
|
|
7 g
|
|
select 0,'#' union select a,b from t1 union all select a,b from t2 union select 7,'gg';
|
|
0 #
|
|
0 #
|
|
1 a
|
|
2 b
|
|
3 c
|
|
3 c
|
|
3 c
|
|
4 d
|
|
5 f
|
|
6 e
|
|
7 g
|
|
select a,b from t1 union select a,b from t1;
|
|
a b
|
|
1 a
|
|
2 b
|
|
3 c
|
|
select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 group by b;
|
|
t1 b count(*)
|
|
t1 a 1
|
|
t1 b 1
|
|
t1 c 2
|
|
t2 c 1
|
|
t2 d 1
|
|
t2 e 1
|
|
t2 f 1
|
|
(select a,b from t1 limit 2) union all (select a,b from t2 order by a) limit 4;
|
|
a b
|
|
1 a
|
|
2 b
|
|
3 c
|
|
4 d
|
|
(select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1);
|
|
a b
|
|
1 a
|
|
2 b
|
|
3 c
|
|
(select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc;
|
|
a b
|
|
3 c
|
|
2 b
|
|
1 a
|
|
(select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by t1.b;
|
|
ERROR 42000: Table 't1' from one of SELECT's can not be used in global ORDER clause
|
|
explain (select a,b from t1 limit 2) union all (select a,b from t2 order by a limit 1) order by b desc;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY t1 ALL NULL NULL NULL NULL 4
|
|
2 UNION t2 ALL NULL NULL NULL NULL 4 Using filesort
|
|
explain select a,b from t1 union all select a,b from t2;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY t1 ALL NULL NULL NULL NULL 4
|
|
2 UNION t2 ALL NULL NULL NULL NULL 4
|
|
explain select xx from t1 union select 1;
|
|
ERROR 42S22: Unknown column 'xx' in 'field list'
|
|
explain select a,b from t1 union select 1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY t1 ALL NULL NULL NULL NULL 4
|
|
2 UNION NULL NULL NULL NULL NULL NULL NULL No tables used
|
|
explain select 1 union select a,b from t1 union select 1;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL No tables used
|
|
2 UNION t1 ALL NULL NULL NULL NULL 4
|
|
3 UNION NULL NULL NULL NULL NULL NULL NULL No tables used
|
|
explain select a,b from t1 union select 1 limit 0;
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
|
|
2 UNION NULL NULL NULL NULL NULL NULL NULL Impossible WHERE
|
|
select a,b from t1 into outfile 'skr' union select a,b from t2;
|
|
ERROR HY000: Wrong usage of UNION and INTO
|
|
select a,b from t1 order by a union select a,b from t2;
|
|
ERROR HY000: Wrong usage of UNION and ORDER BY
|
|
insert into t3 select a from t1 order by a union select a from t2;
|
|
ERROR HY000: Wrong usage of UNION and ORDER BY
|
|
create table t3 select a,b from t1 union select a from t2;
|
|
ERROR 21000: The used SELECT statements have a different number of columns
|
|
select a,b from t1 union select a from t2;
|
|
ERROR 21000: The used SELECT statements have a different number of columns
|
|
select * from t1 union select a from t2;
|
|
ERROR 21000: The used SELECT statements have a different number of columns
|
|
select a from t1 union select * from t2;
|
|
ERROR 21000: The used SELECT statements have a different number of columns
|
|
select * from t1 union select SQL_BUFFER_RESULT * from t2;
|
|
ERROR 42000: Wrong usage/placement of 'SQL_BUFFER_RESULT'
|
|
create table t3 select a,b from t1 union all select a,b from t2;
|
|
insert into t3 select a,b from t1 union all select a,b from t2;
|
|
replace into t3 select a,b as c from t1 union all select a,b from t2;
|
|
drop table t1,t2,t3;
|
|
select * union select 1;
|
|
ERROR HY000: No tables used
|
|
select 1 as a,(select a union select a);
|
|
a (select a union select a)
|
|
1 1
|
|
(select 1) union (select 2) order by 0;
|
|
ERROR 42S22: Unknown column '0' in 'order clause'
|
|
SELECT @a:=1 UNION SELECT @a:=@a+1;
|
|
@a:=1
|
|
1
|
|
2
|
|
(SELECT 1) UNION (SELECT 2) ORDER BY (SELECT a);
|
|
ERROR 42S22: Unknown column 'a' in 'field list'
|
|
(SELECT 1,3) UNION (SELECT 2,1) ORDER BY (SELECT 2);
|
|
1 3
|
|
1 3
|
|
2 1
|
|
CREATE TABLE t1 (
|
|
`pseudo` char(35) NOT NULL default '',
|
|
`pseudo1` char(35) NOT NULL default '',
|
|
`same` tinyint(1) unsigned NOT NULL default '1',
|
|
PRIMARY KEY (`pseudo1`),
|
|
KEY `pseudo` (`pseudo`)
|
|
) TYPE=MyISAM;
|
|
INSERT INTO t1 (pseudo,pseudo1,same) VALUES ('joce', 'testtt', 1),('joce', 'tsestset', 1),('dekad', 'joce', 1);
|
|
SELECT pseudo FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo FROM t1 WHERE pseudo='joce';
|
|
pseudo
|
|
dekad
|
|
joce
|
|
SELECT pseudo1 FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo1 FROM t1 WHERE pseudo='joce';
|
|
pseudo1
|
|
joce
|
|
testtt
|
|
tsestset
|
|
SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc,pseudo1 desc;
|
|
pseudo pseudo1 same
|
|
joce tsestset 1
|
|
joce testtt 1
|
|
dekad joce 1
|
|
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT pseudo FROM t1 WHERE pseudo1='joce';
|
|
pseudo1
|
|
testtt
|
|
tsestset
|
|
dekad
|
|
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION ALL SELECT pseudo FROM t1 WHERE pseudo1='joce';
|
|
pseudo1
|
|
testtt
|
|
tsestset
|
|
dekad
|
|
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT 1;
|
|
pseudo1
|
|
testtt
|
|
tsestset
|
|
1
|
|
drop table t1;
|
|
create table t1 (a int);
|
|
create table t2 (a int);
|
|
insert into t1 values (1),(2),(3),(4),(5);
|
|
insert into t2 values (11),(12),(13),(14),(15);
|
|
(select * from t1 limit 2) union (select * from t2 limit 3) limit 4;
|
|
a
|
|
1
|
|
2
|
|
11
|
|
12
|
|
(select * from t1 limit 2) union (select * from t2 limit 3);
|
|
a
|
|
1
|
|
2
|
|
11
|
|
12
|
|
13
|
|
(select * from t1 limit 2) union (select * from t2 limit 20,3);
|
|
a
|
|
1
|
|
2
|
|
set SQL_SELECT_LIMIT=2;
|
|
(select * from t1 limit 1) union (select * from t2 limit 3);
|
|
a
|
|
1
|
|
11
|
|
set SQL_SELECT_LIMIT=DEFAULT;
|
|
drop table t1,t2;
|
|
CREATE TABLE t1 (
|
|
cid smallint(5) unsigned NOT NULL default '0',
|
|
cv varchar(250) NOT NULL default '',
|
|
PRIMARY KEY (cid),
|
|
UNIQUE KEY cv (cv)
|
|
) ;
|
|
INSERT INTO t1 VALUES (8,'dummy');
|
|
CREATE TABLE t2 (
|
|
cid bigint(20) unsigned NOT NULL auto_increment,
|
|
cap varchar(255) NOT NULL default '',
|
|
PRIMARY KEY (cid),
|
|
KEY cap (cap)
|
|
) ;
|
|
CREATE TABLE t3 (
|
|
gid bigint(20) unsigned NOT NULL auto_increment,
|
|
gn varchar(255) NOT NULL default '',
|
|
must tinyint(4) default NULL,
|
|
PRIMARY KEY (gid),
|
|
KEY gn (gn)
|
|
) ;
|
|
INSERT INTO t3 VALUES (1,'V1',NULL);
|
|
CREATE TABLE t4 (
|
|
uid bigint(20) unsigned NOT NULL default '0',
|
|
gid bigint(20) unsigned default NULL,
|
|
rid bigint(20) unsigned default NULL,
|
|
cid bigint(20) unsigned default NULL,
|
|
UNIQUE KEY m (uid,gid,rid,cid),
|
|
KEY uid (uid),
|
|
KEY rid (rid),
|
|
KEY cid (cid),
|
|
KEY container (gid,rid,cid)
|
|
) ;
|
|
INSERT INTO t4 VALUES (1,1,NULL,NULL);
|
|
CREATE TABLE t5 (
|
|
rid bigint(20) unsigned NOT NULL auto_increment,
|
|
rl varchar(255) NOT NULL default '',
|
|
PRIMARY KEY (rid),
|
|
KEY rl (rl)
|
|
) ;
|
|
CREATE TABLE t6 (
|
|
uid bigint(20) unsigned NOT NULL auto_increment,
|
|
un varchar(250) NOT NULL default '',
|
|
uc smallint(5) unsigned NOT NULL default '0',
|
|
PRIMARY KEY (uid),
|
|
UNIQUE KEY nc (un,uc),
|
|
KEY un (un)
|
|
) ;
|
|
INSERT INTO t6 VALUES (1,'test',8);
|
|
SELECT t4.uid, t5.rl, t3.gn as g1, t4.cid, t4.gid as gg FROM t3, t6, t1, t4 left join t5 on t5.rid = t4.rid left join t2 on t2.cid = t4.cid WHERE t3.gid=t4.gid AND t6.uid = t4.uid AND t6.uc = t1.cid AND t1.cv = "dummy" AND t6.un = "test";
|
|
uid rl g1 cid gg
|
|
1 NULL V1 NULL 1
|
|
SELECT t4.uid, t5.rl, t3.gn as g1, t4.cid, t4.gid as gg FROM t3, t6, t1, t4 left join t5 on t5.rid = t4.rid left join t2 on t2.cid = t4.cid WHERE t3.gid=t4.gid AND t6.uid = t4.uid AND t3.must IS NOT NULL AND t6.uc = t1.cid AND t1.cv = "dummy" AND t6.un = "test";
|
|
uid rl g1 cid gg
|
|
(SELECT t4.uid, t5.rl, t3.gn as g1, t4.cid, t4.gid as gg FROM t3, t6, t1, t4 left join t5 on t5.rid = t4.rid left join t2 on t2.cid = t4.cid WHERE t3.gid=t4.gid AND t6.uid = t4.uid AND t3.must IS NOT NULL AND t6.uc = t1.cid AND t1.cv = "dummy" AND t6.un = "test") UNION (SELECT t4.uid, t5.rl, t3.gn as g1, t4.cid, t4.gid as gg FROM t3, t6, t1, t4 left join t5 on t5.rid = t4.rid left join t2 on t2.cid = t4.cid WHERE t3.gid=t4.gid AND t6.uid = t4.uid AND t6.uc = t1.cid AND t1.cv = "dummy" AND t6.un = "test");
|
|
uid rl g1 cid gg
|
|
1 NULL V1 NULL 1
|
|
drop table t1,t2,t3,t4,t5,t6;
|
|
CREATE TABLE t1 ( id int(3) unsigned default '0') TYPE=MyISAM;
|
|
INSERT INTO t1 (id) VALUES("1");
|
|
CREATE TABLE t2 ( id int(3) unsigned default '0', id_master int(5) default '0', text1 varchar(5) default NULL, text2 varchar(5) default NULL) TYPE=MyISAM;
|
|
INSERT INTO t2 (id, id_master, text1, text2) VALUES("1", "1",
|
|
"foo1", "bar1");
|
|
INSERT INTO t2 (id, id_master, text1, text2) VALUES("2", "1",
|
|
"foo2", "bar2");
|
|
INSERT INTO t2 (id, id_master, text1, text2) VALUES("3", "1", NULL,
|
|
"bar3");
|
|
INSERT INTO t2 (id, id_master, text1, text2) VALUES("4", "1",
|
|
"foo4", "bar4");
|
|
SELECT 1 AS id_master, 1 AS id, NULL AS text1, 'ABCDE' AS text2 UNION SELECT id_master, t2.id, text1, text2 FROM t1 LEFT JOIN t2 ON t1.id = t2.id_master;
|
|
id_master id text1 text2
|
|
1 1 NULL ABCDE
|
|
1 1 bar1
|
|
1 2 bar2
|
|
1 3 NULL bar3
|
|
1 4 bar4
|
|
SELECT 1 AS id_master, 1 AS id, 'ABCDE' AS text1, 'ABCDE' AS text2 UNION SELECT id_master, t2.id, text1, text2 FROM t1 LEFT JOIN t2 ON t1.id = t2.id_master;
|
|
id_master id text1 text2
|
|
1 1 ABCDE ABCDE
|
|
1 1 foo1 bar1
|
|
1 2 foo2 bar2
|
|
1 3 NULL bar3
|
|
1 4 foo4 bar4
|
|
drop table if exists t1,t2;
|
|
create table t1 (a int not null primary key auto_increment, b int, key(b));
|
|
create table t2 (a int not null primary key auto_increment, b int);
|
|
insert into t1 (b) values (1),(2),(2),(3);
|
|
insert into t2 (b) values (10),(11),(12),(13);
|
|
explain (select * from t1 where a=1) union (select * from t2 where a=1);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1
|
|
2 UNION t2 const PRIMARY PRIMARY 4 const 1
|
|
(select * from t1 where a=5) union (select * from t2 where a=1);
|
|
a b
|
|
1 10
|
|
(select * from t1 where a=5 and a=6) union (select * from t2 where a=1);
|
|
a b
|
|
1 10
|
|
(select t1.a,t1.b from t1,t2 where t1.a=5) union (select * from t2 where a=1);
|
|
a b
|
|
1 10
|
|
(select * from t1 where a=1) union (select t1.a,t2.a from t1,t2 where t1.a=t2.a);
|
|
a b
|
|
1 1
|
|
2 2
|
|
3 3
|
|
4 4
|
|
explain (select * from t1 where a=1 and b=10) union (select t1.a,t2.a from t1,t2 where t1.a=t2.a);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY NULL NULL NULL NULL NULL NULL NULL Impossible WHERE noticed after reading const tables
|
|
2 UNION t1 index PRIMARY PRIMARY 4 NULL 4 Using index
|
|
2 UNION t2 index PRIMARY PRIMARY 4 NULL 4 Using where; Using index
|
|
explain (select * from t1 where a=1) union (select * from t1 where b=1);
|
|
id select_type table type possible_keys key key_len ref rows Extra
|
|
1 PRIMARY t1 const PRIMARY PRIMARY 4 const 1
|
|
2 UNION t1 ref b b 5 const 1 Using where
|
|
drop table t1,t2;
|