Move handler dependent tests to the specific handler (myisam, bdb, innodb)

Enabled VARCHAR testing for innodb

NOTE: innodb.test currently fails becasue of a bug in InnoDB. 
I have informed Heikki about this and expect him to fix this ASAP


mysql-test/include/varchar.inc:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/r/innodb.result:
  Added varchar tests
mysql-test/r/myisam.result:
  Update results
mysql-test/t/bdb.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
mysql-test/t/innodb.test:
  Enabled VARCHAR testing
mysql-test/t/myisam.test:
  Move handler dependent tests to the specific handler (myisam, bdb, innodb)
sql/sql_parse.cc:
  Indentation fixes
sql/sql_table.cc:
  Fixed bug introduced when doing cleanup

3 files changed, 51 insertions, 7 deletions

diff --git a/mysql-test/t/bdb.test b/mysql-test/t/bdb.test
index af38be98151..f4895318818 100644
--- a/mysql-test/t/bdb.test
+++ b/mysql-test/t/bdb.test
@@ -954,4 +954,19 @@ drop table t1;
 let $default=`select @@storage_engine`;
 set storage_engine=bdb;
 source include/varchar.inc;
+
+#
+# Some errors/warnings on create
+#
+
+create table t1 (v varchar(65530), key(v));
+drop table if exists t1;
+create table t1 (v varchar(65536));
+show create table t1;
+drop table t1;
+create table t1 (v varchar(65530) character set utf8);
+show create table t1;
+drop table t1;
+
+# End varchar test
 eval set storage_engine=$default;
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 057d326eb52..a6250c5041b 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -1285,15 +1285,30 @@ show variables like "innodb_thread_sleep_delay";
 # Test varchar
 #
 
-#let $default=`select @@storage_engine`;
-#set storage_engine=INNODB;
-#source include/varchar.inc;
-#eval set storage_engine=$default;
+let $default=`select @@storage_engine`;
+set storage_engine=INNODB;
+source include/varchar.inc;
+
+#
+# Some errors/warnings on create
+#
+
+--error 1005
+create table t1 (v varchar(65530), key(v));
+create table t1 (v varchar(65536));
+show create table t1;
+drop table t1;
+create table t1 (v varchar(65530) character set utf8);
+show create table t1;
+drop table t1;
+
+eval set storage_engine=$default;
 
 # InnoDB specific varchar tests
 create table t1 (v varchar(16384)) engine=innodb;
 drop table t1;
 
 # The following should be moved to type_bit.test when innodb will support it
---error 1178                                                                    
-create table t1 (a bit, key(a)) engine=innodb;                                  
+--error 1178
+create table t1 (a bit, key(a)) engine=innodb;
+
diff --git a/mysql-test/t/myisam.test b/mysql-test/t/myisam.test
index 9464513413a..3fd69a24903 100644
--- a/mysql-test/t/myisam.test
+++ b/mysql-test/t/myisam.test
@@ -560,12 +560,26 @@ drop table t1,t2;
 let $default=`select @@storage_engine`;
 set storage_engine=MyISAM;
 source include/varchar.inc;
-eval set storage_engine=$default;
+
+#
+# Some errors/warnings on create
+#
+
+create table t1 (v varchar(65530), key(v));
+drop table if exists t1;
+create table t1 (v varchar(65536));
+show create table t1;
+drop table t1;
+create table t1 (v varchar(65530) character set utf8);
+show create table t1;
+drop table t1;
 
 # MyISAM specific varchar tests
 --error 1118
 create table t1 (v varchar(65535));
 
+eval set storage_engine=$default;
+
 #
 # Test how DROP TABLE works if the index or data file doesn't exists