Added test to show bug in current union implementation

After merge fixes
Portability fixes


client/mysqltest.c:
  Fixed that unget() is done properly (needed for QNX where one can't do many ungetc() in a row)
include/errmsg.h:
  After merge fixes
mysql-test/mysql-test-run.sh:
  merge fix
mysql-test/r/system_mysql_db.result:
  Updated results for 4.1
mysql-test/r/union.result:
  Added new test
mysql-test/t/derived.test:
  Portability fix (for Mac OS X)
mysql-test/t/system_mysql_db_refs.test:
  Remove warnings
mysql-test/t/union.test:
  Added test to show bug in current union implementation (to be fixed in 4.1)
scripts/mysql_create_system_tables.sh:
  Fix wrong column define
scripts/mysql_fix_privilege_tables.sh:
  Fix for mysql-test-run
scripts/mysql_fix_privilege_tables.sql:
  Merge with 4.0 to get comments.
  Updated so that it works with privilege tables for MySQL 3.23.
sql/repl_failsafe.cc:
  After merge fix

1 files changed, 13 insertions, 0 deletions

diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index 7d1818ab724..06110474992 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -483,3 +483,16 @@ select col1 n from t1 union select col2 n from t1 order by n;
 alter table t1 add index myindex (col2);
 select col1 n from t1 union select col2 n from t1 order by n;
 drop  table t1;
+
+#
+# Bug #1428, incorrect handling of UNION ALL
+# NOTE: The current result is wrong, needs to be fixed!
+#
+
+create table t1 (i int);
+insert into t1 values (1);
+select * from t1 UNION select * from t1;
+select * from t1 UNION ALL select * from t1;
+# The following should return 2 lines
+select * from t1 UNION select * from t1 UNION ALL select * from t1;
+drop table t1;