Merge bk-internal:/home/bk/mysql-5.0

into mysql.com:/home/mysqldev/tulin/mysql-5.0

5 files changed, 8 insertions, 7 deletions

diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 13914384d8d..d65ce794a75 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -1798,3 +1798,5 @@ Variable_name	Value
 innodb_thread_sleep_delay	10000
 create table t1 (v varchar(16384)) engine=innodb;
 ERROR 42000: Column length too big for column 'v' (max = 255); use BLOB instead
+create table t1 (a bit, key(a)) engine=innodb;
+ERROR 42000: The storage engine for the table doesn't support BIT FIELD
diff --git a/mysql-test/r/type_bit.result b/mysql-test/r/type_bit.result
index 88bb04fefba..dde50a1ee00 100644
--- a/mysql-test/r/type_bit.result
+++ b/mysql-test/r/type_bit.result
@@ -44,8 +44,6 @@ t1	CREATE TABLE `t1` (
   `a` bit(1) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
-create table t1 (a bit, key(a)) engine=innodb;
-ERROR 42000: The storage engine for the table doesn't support BIT FIELD
 create table t1 (a bit(64));
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
diff --git a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
index 3cfd173165b..6514f3d5c94 100644
--- a/mysql-test/t/innodb.test
+++ b/mysql-test/t/innodb.test
@@ -1278,3 +1278,7 @@ show variables like "innodb_thread_sleep_delay";
 # InnoDB specific varchar tests
 --error 1074
 create table t1 (v varchar(16384)) engine=innodb;
+
+# 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;                                  
diff --git a/mysql-test/t/type_bit.test b/mysql-test/t/type_bit.test
index fed15806765..f00fcfef7ab 100644
--- a/mysql-test/t/type_bit.test
+++ b/mysql-test/t/type_bit.test
@@ -26,9 +26,6 @@ create table t1 (a bit(0));
 show create table t1;
 drop table t1;
 
---error 1178
-create table t1 (a bit, key(a)) engine=innodb;
-
 create table t1 (a bit(64));
 insert into t1 values 
 (b'1111111111111111111111111111111111111111111111111111111111111111'),
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index 30b3e88bd82..15abbf007e4 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -2245,9 +2245,9 @@ void Dbdict::checkSchemaStatus(Signal* signal)
 	  restartCreateTab(signal, tableId, oldEntry, false);
           return;
         }//if
-	ndbrequire(ok);
-	break;
       }
+      ndbrequire(ok);
+      break;
     }
     case SchemaFile::DROP_TABLE_STARTED:
       jam();