Manual merge.

client/mysqldump.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
client/client_priv.h:
  Manual merge (still to be corrected!)

5 files changed, 68 insertions, 14 deletions

diff --git a/mysql-test/r/mysqldump.result b/mysql-test/r/mysqldump.result
index 35d0df0c888..f73c9b223fd 100644
--- a/mysql-test/r/mysqldump.result
+++ b/mysql-test/r/mysqldump.result
@@ -1384,3 +1384,41 @@ UNLOCK TABLES;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
 drop table t1;
+CREATE TABLE t1 (a int);
+INSERT INTO t1 VALUES (1),(2),(3);
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+/*!40000 DROP DATABASE IF EXISTS `test`*/;
+
+CREATE DATABASE /*!32312 IF NOT EXISTS*/ `test` /*!40100 DEFAULT CHARACTER SET latin1 */;
+
+USE `test`;
+DROP TABLE IF EXISTS `t1`;
+CREATE TABLE `t1` (
+  `a` int(11) default NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+
+
+/*!40000 ALTER TABLE `t1` DISABLE KEYS */;
+LOCK TABLES `t1` WRITE;
+INSERT INTO `t1` VALUES (1),(2),(3);
+UNLOCK TABLES;
+/*!40000 ALTER TABLE `t1` ENABLE KEYS */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+DROP TABLE t1;
diff --git a/mysql-test/r/reserved_win_names.require b/mysql-test/r/reserved_win_names.require
deleted file mode 100644
index 7f803aca482..00000000000
--- a/mysql-test/r/reserved_win_names.require
+++ /dev/null
@@ -1,2 +0,0 @@
-Variable_name	Value
-lower_case_table_names 1	
diff --git a/mysql-test/r/reserved_win_names.result b/mysql-test/r/reserved_win_names.result
deleted file mode 100644
index eaa0f71513f..00000000000
--- a/mysql-test/r/reserved_win_names.result
+++ /dev/null
@@ -1,7 +0,0 @@
-use COM1;
-ERROR 42000: Unknown database 'com1'
-use LPT1;
-ERROR 42000: Unknown database 'lpt1'
-use PRN;
-ERROR 42000: Unknown database 'prn'
-
diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index 8932d2c78ae..6e19fa09d1b 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -2676,3 +2676,9 @@ AND FK_firma_id = 2;
 COUNT(*)
 0
 drop table t1;
+CREATE TABLE t1 (b BIGINT(20) UNSIGNED NOT NULL, PRIMARY KEY (b));
+INSERT INTO t1 VALUES (0x8000000000000000);
+SELECT b FROM t1 WHERE b=0x8000000000000000;
+b
+9223372036854775808
+DROP TABLE t1;
diff --git a/mysql-test/r/union.result b/mysql-test/r/union.result
index aae3c414c5c..22417136f67 100644
--- a/mysql-test/r/union.result
+++ b/mysql-test/r/union.result
@@ -1201,27 +1201,27 @@ concat('value is: ', @val)
 value is: 6
 some text
 CREATE TABLE t1 (
-a ENUM('ä','ö','ü') character set utf8 not null default 'ü',
+a ENUM('ä','ö','ü') character set utf8 not null default 'ü',
 b ENUM("one", "two") character set utf8,
 c ENUM("one", "two")
 );
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` enum('ä','ö','ü') character set utf8 NOT NULL default 'ü',
+  `a` enum('ä','ö','ü') character set utf8 NOT NULL default 'ü',
   `b` enum('one','two') character set utf8 default NULL,
   `c` enum('one','two') default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
-insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL);
+insert into t1 values ('ä', 'one', 'one'), ('ö', 'two', 'one'), ('ü', NULL, NULL);
 create table t2 select NULL union select a from t1;
 show columns from t2;
 Field	Type	Null	Key	Default	Extra
-NULL	enum('ä','ö','ü')	YES		NULL	
+NULL	enum('ä','ö','ü')	YES		NULL	
 drop table t2;
 create table t2 select a from t1 union select NULL;
 show columns from t2;
 Field	Type	Null	Key	Default	Extra
-a	enum('ä','ö','ü')	YES		NULL	
+a	enum('ä','ö','ü')	YES		NULL	
 drop table t2;
 create table t2 select a from t1 union select a from t1;
 show columns from t2;
@@ -1252,3 +1252,22 @@ t2	CREATE TABLE `t2` (
   `a` varchar(12) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
 drop table t1,t2;
+create table t1 ( id int not null auto_increment, primary key (id), col1 int);
+insert into t1 (col1) values (2),(3),(4),(5),(6);
+select 99 union all select id from t1 order by 1;
+99
+1
+2
+3
+4
+5
+99
+select id from t1 union all select 99 order by 1;
+id
+1
+2
+3
+4
+5
+99
+drop table t1;