Fixed bug with SELECT * ... UNION

client/mysql.cc:
  Increased version number
client/mysqltest.c:
  Changed to use default path
include/mysql.h:
  Changed prototype of mysql_server_init
libmysql/libmysql.c:
  Changed prototype of mysql_server_init
libmysqld/lib_sql.cc:
  Changed prototype of mysql_server_init
mysql-test/r/union.result:
  Added test for UNION bug
mysql-test/t/union.test:
  Added test for UNION bug

2 files changed, 14 insertions, 3 deletions

diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index b46a706264f..a0836cf1680 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -62,3 +62,7 @@ t2	ALL	NULL	NULL	NULL	NULL	4
 pseudo
 dekad
 joce
+pseudo	pseudo1	same
+dekad	joce	1
+joce	testtt	1
+joce	tsestset	1
diff --git a/mysql-test/t/union.test b/mysql-test/t/union.test
index a5f1bfd644d..8325e6c7e77 100644
--- a/mysql-test/t/union.test
+++ b/mysql-test/t/union.test
@@ -25,15 +25,21 @@ select a,b from t1 into outfile 'skr' union select a,b from t2;
 --error 1216
 select a,b from t1 order by a union select a,b from t2;
 
---error 1217
-create table t3 select a,b from t1 union select a from t2;
-
 --error 1216
 insert into t3 select a from t1 order by a union select a from t2;
 
 --error 1217
+create table t3 select a,b from t1 union select a from t2;
+
+--error 1217
 select a,b from t1 union select a from t2;
 
+--error 1217
+select * from t1 union select a from t2;
+
+--error 1217
+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;
@@ -54,4 +60,5 @@ CREATE TABLE t1 (
 ) 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 * FROM t1 WHERE pseudo1='joce' UNION SELECT * FROM t1 WHERE pseudo='joce';
 drop table t1;