mirror of
				https://github.com/MariaDB/server.git
				synced 2025-11-03 14:33:32 +03:00 
			
		
		
		
	Fixed bug in query cache. Cleaned up des_crypt code. BitKeeper/deleted/.del-fsck.mysql~87170d4358b50d60: Delete: fs/fsck.mysql Docs/manual.texi: Changed != to <> mysql-test/mysql-test-run.sh: Fix sleep times to take into account creation of InnoDB tables. mysql-test/r/group_by.result: More tests mysql-test/r/query_cache.result: More tests mysql-test/r/union.result: More tests mysql-test/t/func_str.test: Fix for FreeBSD mysql-test/t/query_cache.test: More tests mysql-test/t/union.test: More tests mysys/my_winsem.c: Cleanup comments sql/des_key_file.cc: Cleanup des_crypt code sql/item_strfunc.cc: Cleanup des_crypt code sql/item_strfunc.h: Cleanup des_crypt code sql/mysql_priv.h: Cleanup des_crypt code sql/mysqld.cc: Cleanup des_crypt code sql/sql_acl.cc: For for GRANT and lower-case-table names sql/sql_cache.cc: Function for integrity checking. Fixed bug when merging blocks. sql/sql_cache.h: Function for integrity checking. sql/sql_delete.cc: Cleanup sql/sql_parse.cc: For for GRANT and lower-case-table names sql/sql_union.cc: Cleanup & fixed bug in LIMIT handling sql/sql_yacc.yy: C
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
#
 | 
						|
# Test of unions
 | 
						|
#
 | 
						|
 | 
						|
drop table if exists t1,t2,t3;
 | 
						|
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;
 | 
						|
select a,b from t1 union all select a,b from t2;
 | 
						|
select a,b from t1 union all select a,b from t2 order by b;
 | 
						|
select a,b from t1 union all select a,b from t2 union select 7,'g';
 | 
						|
select 0,'#' union select a,b from t1 union all select a,b from t2 union select 7,'gg';
 | 
						|
select a,b from t1 union select a,b from t1;
 | 
						|
select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 group by b;
 | 
						|
 | 
						|
#test alternate syntax for unions 
 | 
						|
(select a,b from t1 limit 2)  union all (select a,b from t2 order by a) limit 4;
 | 
						|
(select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1);
 | 
						|
(select a,b from t1 limit 2)  union all (select a,b from t2 order by a limit 1) order by b desc;
 | 
						|
 | 
						|
# Test some error conditions with UNION
 | 
						|
explain select a,b from t1 union all select a,b from t2;
 | 
						|
 | 
						|
--error 1221
 | 
						|
select a,b from t1 into outfile 'skr' union select a,b from t2;
 | 
						|
 | 
						|
--error 1221
 | 
						|
select a,b from t1 order by a union select a,b from t2;
 | 
						|
 | 
						|
--error 1221
 | 
						|
insert into t3 select a from t1 order by a union select a from t2;
 | 
						|
 | 
						|
--error 1222
 | 
						|
create table t3 select a,b from t1 union select a from t2;
 | 
						|
 | 
						|
--error 1222
 | 
						|
select a,b from t1 union select a from t2;
 | 
						|
 | 
						|
--error 1222
 | 
						|
select * from t1 union select a from t2;
 | 
						|
 | 
						|
--error 1222
 | 
						|
select a from t1 union select * from t2;
 | 
						|
 | 
						|
# Test CREATE, INSERT and REPLACE
 | 
						|
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;
 | 
						|
 | 
						|
#
 | 
						|
# Test bug reported by joc@presence-pc.com
 | 
						|
#
 | 
						|
 | 
						|
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';
 | 
						|
SELECT pseudo1 FROM t1 WHERE pseudo1='joce' UNION SELECT pseudo1 FROM t1 WHERE pseudo='joce';
 | 
						|
SELECT * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce' order by pseudo desc,pseudo1 desc;
 | 
						|
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT pseudo FROM t1 WHERE pseudo1='joce';
 | 
						|
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION ALL SELECT pseudo FROM t1 WHERE pseudo1='joce';
 | 
						|
SELECT pseudo1 FROM t1 WHERE pseudo='joce' UNION SELECT 1;
 | 
						|
drop table t1;
 |