From af19fa462856d517d3a35737389f432fe071a4f6 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 14 Sep 2001 19:50:56 +0300 Subject: Fixed bug in UNION Fixed replication bug in load_master_data BitKeeper/deleted/.del-global.h~e80d28157acfdcb5: Delete: include/global.h Docs/manual.texi: Cleaned up "Things to do in 4.0" mysql-test/r/union.result: New test mysql-test/t/union.test: New test mysys/my_lib.c: Cleanup sql/mysql_priv.h: Fixed replication bug load_master_data sql/sql_base.cc: Fixed bug in UNION sql/sql_db.cc: Fixed replication bug load_master_data sql/sql_parse.cc: Fixed replication bug load_master_data sql/sql_repl.cc: Fixed replication bug load_master_data sql/sql_union.cc: Fixed bug in UNION tools/mysqlmanager.c: Portability fix --- mysql-test/r/union.result | 3 +++ mysql-test/t/union.test | 25 ++++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) (limited to 'mysql-test') diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result index 31244341196..b46a706264f 100644 --- a/mysql-test/r/union.result +++ b/mysql-test/r/union.result @@ -59,3 +59,6 @@ t2 f 1 table type possible_keys key key_len ref rows Extra t1 ALL NULL NULL NULL NULL 4 t2 ALL NULL NULL NULL NULL 4 +pseudo +dekad +joce diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test index c3a0e1ef901..a5f1bfd644d 100644 --- a/mysql-test/t/union.test +++ b/mysql-test/t/union.test @@ -19,19 +19,19 @@ select 't1',b,count(*) from t1 group by b UNION select 't2',b,count(*) from t2 g # Test some error conditions with UNION explain select a,b from t1 union all select a,b from t2; ---error 1215 +--error 1216 select a,b from t1 into outfile 'skr' union select a,b from t2; ---error 1215 +--error 1216 select a,b from t1 order by a union select a,b from t2; ---error 1216 +--error 1217 create table t3 select a,b from t1 union select a from t2; ---error 1215 +--error 1216 insert into t3 select a from t1 order by a union select a from t2; ---error 1216 +--error 1217 select a,b from t1 union select a from t2; # Test CREATE, INSERT and REPLACE @@ -40,3 +40,18 @@ 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'; +drop table t1; -- cgit v1.2.1