Commit bc14ad82 authored by unknown's avatar unknown

Merge paul@bk-internal.mysql.com:/home/bk/mysql-4.1

into ice.snake.net:/Volumes/ice2/MySQL/bk/mysql-4.1

parents c1ed639c de13ae26
...@@ -203,7 +203,7 @@ a ...@@ -203,7 +203,7 @@ a
2 2
check table t1; check table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check error The storage enginge for the table doesn't support check test.t1 check error The storage engine for the table doesn't support check
drop table t1; drop table t1;
create table t1 (a int,b varchar(20)) type=bdb; create table t1 (a int,b varchar(20)) type=bdb;
insert into t1 values (1,""), (2,"testing"); insert into t1 values (1,""), (2,"testing");
......
...@@ -156,7 +156,7 @@ level id parent_id ...@@ -156,7 +156,7 @@ level id parent_id
1 1007 101 1 1007 101
optimize table t1; optimize table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The storage enginge for the table doesn't support optimize test.t1 optimize error The storage engine for the table doesn't support optimize
show keys from t1; show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 id A # NULL NULL BTREE t1 0 PRIMARY 1 id A # NULL NULL BTREE
...@@ -180,7 +180,7 @@ create table t1 (a int) type=innodb; ...@@ -180,7 +180,7 @@ create table t1 (a int) type=innodb;
insert into t1 values (1), (2); insert into t1 values (1), (2);
optimize table t1; optimize table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The storage enginge for the table doesn't support optimize test.t1 optimize error The storage engine for the table doesn't support optimize
delete from t1 where a = 1; delete from t1 where a = 1;
select * from t1; select * from t1;
a a
...@@ -712,7 +712,7 @@ world 2 ...@@ -712,7 +712,7 @@ world 2
hello 1 hello 1
optimize table t1; optimize table t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The storage enginge for the table doesn't support optimize test.t1 optimize error The storage engine for the table doesn't support optimize
show keys from t1; show keys from t1;
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment
t1 0 PRIMARY 1 a A 2 NULL NULL BTREE t1 0 PRIMARY 1 a A 2 NULL NULL BTREE
......
...@@ -57,14 +57,14 @@ test.t1 optimize status OK ...@@ -57,14 +57,14 @@ test.t1 optimize status OK
check table t1,t2; check table t1,t2;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 check status OK test.t1 check status OK
test.t2 check error The storage enginge for the table doesn't support check test.t2 check error The storage engine for the table doesn't support check
repair table t1,t2; repair table t1,t2;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair status OK test.t1 repair status OK
test.t2 repair error The storage enginge for the table doesn't support repair test.t2 repair error The storage engine for the table doesn't support repair
check table t2,t1; check table t2,t1;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t2 check error The storage enginge for the table doesn't support check test.t2 check error The storage engine for the table doesn't support check
test.t1 check status OK test.t1 check status OK
lock tables t1 write; lock tables t1 write;
check table t2,t1; check table t2,t1;
......
...@@ -7,7 +7,7 @@ test.t1 repair status OK ...@@ -7,7 +7,7 @@ test.t1 repair status OK
alter table t1 TYPE=HEAP; alter table t1 TYPE=HEAP;
repair table t1 use_frm; repair table t1 use_frm;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 repair error The storage enginge for the table doesn't support repair test.t1 repair error The storage engine for the table doesn't support repair
drop table t1; drop table t1;
repair table t1 use_frm; repair table t1 use_frm;
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
......
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
"You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column", "You are using safe update mode and you tried to update a table without a WHERE that uses a KEY column",
"Key '%-.64s' doesn't exist in table '%-.64s'", "Key '%-.64s' doesn't exist in table '%-.64s'",
"Can't open table", "Can't open table",
"The storage enginge for the table doesn't support %s", "The storage engine for the table doesn't support %s",
"You are not allowed to execute this command in a transaction", "You are not allowed to execute this command in a transaction",
"Got error %d during COMMIT", "Got error %d during COMMIT",
"Got error %d during ROLLBACK", "Got error %d during ROLLBACK",
......
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