Commit d1539fb3 authored by unknown's avatar unknown

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

into mysql.com:/home/mysqldev/tulin/mysql-5.0
parents bc8bdd5b dfa8edc5
...@@ -1798,3 +1798,5 @@ Variable_name Value ...@@ -1798,3 +1798,5 @@ Variable_name Value
innodb_thread_sleep_delay 10000 innodb_thread_sleep_delay 10000
create table t1 (v varchar(16384)) engine=innodb; create table t1 (v varchar(16384)) engine=innodb;
ERROR 42000: Column length too big for column 'v' (max = 255); use BLOB instead 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
...@@ -44,8 +44,6 @@ t1 CREATE TABLE `t1` ( ...@@ -44,8 +44,6 @@ t1 CREATE TABLE `t1` (
`a` bit(1) default NULL `a` bit(1) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; 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)); create table t1 (a bit(64));
insert into t1 values insert into t1 values
(b'1111111111111111111111111111111111111111111111111111111111111111'), (b'1111111111111111111111111111111111111111111111111111111111111111'),
......
...@@ -1278,3 +1278,7 @@ show variables like "innodb_thread_sleep_delay"; ...@@ -1278,3 +1278,7 @@ show variables like "innodb_thread_sleep_delay";
# InnoDB specific varchar tests # InnoDB specific varchar tests
--error 1074 --error 1074
create table t1 (v varchar(16384)) engine=innodb; 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;
...@@ -26,9 +26,6 @@ create table t1 (a bit(0)); ...@@ -26,9 +26,6 @@ create table t1 (a bit(0));
show create table t1; show create table t1;
drop table t1; drop table t1;
--error 1178
create table t1 (a bit, key(a)) engine=innodb;
create table t1 (a bit(64)); create table t1 (a bit(64));
insert into t1 values insert into t1 values
(b'1111111111111111111111111111111111111111111111111111111111111111'), (b'1111111111111111111111111111111111111111111111111111111111111111'),
......
...@@ -2245,10 +2245,10 @@ void Dbdict::checkSchemaStatus(Signal* signal) ...@@ -2245,10 +2245,10 @@ void Dbdict::checkSchemaStatus(Signal* signal)
restartCreateTab(signal, tableId, oldEntry, false); restartCreateTab(signal, tableId, oldEntry, false);
return; return;
}//if }//if
}
ndbrequire(ok); ndbrequire(ok);
break; break;
} }
}
case SchemaFile::DROP_TABLE_STARTED: case SchemaFile::DROP_TABLE_STARTED:
jam(); jam();
case SchemaFile::DROP_TABLE_COMMITTED:{ case SchemaFile::DROP_TABLE_COMMITTED:{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment