Merged 4.1 -> 5.0

6 files changed, 14 insertions, 16 deletions

diff --git a/mysql-test/r/create.result b/mysql-test/r/create.result
index 8661e32d4bb..632e556d0ab 100644
--- a/mysql-test/r/create.result
+++ b/mysql-test/r/create.result
@@ -201,17 +201,16 @@ t1	CREATE TABLE `t1` (
 ) TYPE=HEAP DEFAULT CHARSET=latin1
 drop table t1;
 SET SESSION table_type="gemini";
+ERROR 42000: Unknown table engine 'gemini'
 SELECT @@table_type;
 @@table_type
-GEMINI
+HEAP
 CREATE TABLE t1 (a int not null);
-Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0'
-) TYPE=MyISAM DEFAULT CHARSET=latin1
+) TYPE=HEAP DEFAULT CHARSET=latin1
 SET SESSION table_type=default;
 drop table t1;
 create table t1 ( k1 varchar(2), k2 int, primary key(k1,k2));
@@ -347,17 +346,16 @@ t1	CREATE TABLE `t1` (
 ) TYPE=HEAP DEFAULT CHARSET=latin1
 drop table t1;
 SET SESSION table_type="gemini";
+ERROR 42000: Unknown table engine 'gemini'
 SELECT @@table_type;
 @@table_type
-GEMINI
+HEAP
 CREATE TABLE t1 (a int not null);
-Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) NOT NULL default '0'
-) TYPE=MyISAM DEFAULT CHARSET=latin1
+) TYPE=HEAP DEFAULT CHARSET=latin1
 SET SESSION table_type=default;
 drop table t1;
 create table t1(a int,b int,c int unsigned,d date,e char,f datetime,g time,h blob);
diff --git a/mysql-test/r/fulltext_var.result b/mysql-test/r/fulltext_var.result
index f45e18a9591..89d477c1a7c 100644
--- a/mysql-test/r/fulltext_var.result
+++ b/mysql-test/r/fulltext_var.result
@@ -2,6 +2,6 @@ show variables like "ft\_%";
 Variable_name	Value
 ft_boolean_syntax	+ -><()~*:""&|
 ft_min_word_len	4
-ft_max_word_len	254
+ft_max_word_len	84
 ft_query_expansion_limit	20
 ft_stopword_file	(built-in)
diff --git a/mysql-test/r/variables.result b/mysql-test/r/variables.result
index 3e7e6af7408..30de6e63598 100644
--- a/mysql-test/r/variables.result
+++ b/mysql-test/r/variables.result
@@ -143,7 +143,7 @@ Variable_name	Value
 table_type	HEAP
 show global variables like 'table_type';
 Variable_name	Value
-table_type	INNODB
+table_type	InnoDB
 set GLOBAL query_cache_size=100000;
 set GLOBAL myisam_max_sort_file_size=2000000;
 show global variables like 'myisam_max_sort_file_size';
@@ -241,7 +241,7 @@ ERROR HY000: Unknown system variable 'unknown_variable'
 set max_join_size="hello";
 ERROR 42000: Wrong argument type to variable 'max_join_size'
 set table_type=UNKNOWN_TABLE_TYPE;
-ERROR 42000: Variable 'table_type' can't be set to the value of 'UNKNOWN_TABLE_TYPE'
+ERROR 42000: Unknown table engine 'UNKNOWN_TABLE_TYPE'
 set table_type=INNODB, big_tables=2;
 ERROR 42000: Variable 'big_tables' can't be set to the value of '2'
 show local variables like 'table_type';
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 26353785733..1942f1a25bb 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -121,8 +121,8 @@ select @@warning_count;
 drop table t1;
 create table t1 (id int) type=isam;
 Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
+Warning	1265	Using storage engine MyISAM for table 't1'
 alter table t1 type=isam;
 Warnings:
-Warning	1265	Using storage engine MYISAM for table 't1'
+Warning	1265	Using storage engine MyISAM for table 't1'
 drop table t1;
diff --git a/mysql-test/t/create.test b/mysql-test/t/create.test
index dc4d2701bee..5bb7e420e1c 100644
--- a/mysql-test/t/create.test
+++ b/mysql-test/t/create.test
@@ -157,7 +157,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
-# Test what happens when using a non existing table type
+--error 1285
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
@@ -277,7 +277,7 @@ SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
 show create table t1;
 drop table t1;
-# Test what happens when using a non existing table type
+--error 1285
 SET SESSION table_type="gemini";
 SELECT @@table_type;
 CREATE TABLE t1 (a int not null);
diff --git a/mysql-test/t/variables.test b/mysql-test/t/variables.test
index 289f04153c8..ef3dadeaffe 100644
--- a/mysql-test/t/variables.test
+++ b/mysql-test/t/variables.test
@@ -136,7 +136,7 @@ set big_tables="OFFF";
 set unknown_variable=1;
 --error 1232
 set max_join_size="hello";
---error 1231
+--error 1285
 set table_type=UNKNOWN_TABLE_TYPE;
 --error 1231
 set table_type=INNODB, big_tables=2;