mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
55c765925d
SHOW CREATE TABLE fails Underlying table names, that merge engine fails to open were not reported. With this fix CHECK TABLE issued against merge table reports all underlying table names that it fails to open. Other statements are unaffected, that is underlying table names are not included into error message. This fix doesn't solve SHOW CREATE TABLE issue. myisammrg/myrg_def.h: Added myrg_print_wrong_table declaration. myisammrg/myrg_open.c: If HA_OPEN_FOR_REPAIR is passed to merge engine open function, report names of tables that we fail to open. mysql-test/r/backup.result: Updated test result. mysql-test/r/key_cache.result: Updated test result - removed duplicate error. mysql-test/r/lock.result: Updated test result - added summary row. mysql-test/r/merge.result: A test case for BUG#26976. mysql-test/r/preload.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/ps.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/repair.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/rpl_failed_optimize.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/sp.result: Updated test result - removed duplicate error, added summary row. mysql-test/r/view.result: Updated test result - removed duplicate error, added summary row. mysql-test/t/merge.test: A test case for BUG#26976. sql/ha_myisam.cc: Do not report same error twice. sql/ha_myisammrg.cc: If HA_OPEN_FOR_REPAIR is passed to merge engine open function, report names of tables that we fail to open. Added dummy ha_myisammrg::check to not confuse users with "not implemented" error in case all underlying tables are fine. sql/ha_myisammrg.h: Added ha_myisammrg::check declaration. sql/share/errmsg.txt: Added ER_ADMIN_WRONG_MRG_TABLE errno. It is used instead of ER_WRONG_MRG_TABLE in case HA_OPEN_FOR_REPAIR is passed to merge engine handler open function. sql/sql_error.cc: warning_level_* are now public. It is required by mysql_admin_table to report message level. sql/sql_error.h: warning_level_* are now public. It is required by mysql_admin_table to report message level. sql/sql_table.cc: Reorder mysql_admin_table arguments to meet it's definition. Report errors that are pending in thd->warn_list as results of admin function.
71 lines
2.5 KiB
Text
71 lines
2.5 KiB
Text
drop table if exists t1,t2;
|
|
CREATE TABLE t1 ( `id` int(11) NOT NULL default '0', `id2` int(11) NOT NULL default '0', `id3` int(11) NOT NULL default '0', `dummy1` char(30) default NULL, PRIMARY KEY (`id`,`id2`), KEY `index_id3` (`id3`)) ENGINE=MyISAM;
|
|
insert into t1 (id,id2) values (1,1),(1,2),(1,3);
|
|
LOCK TABLE t1 WRITE;
|
|
select dummy1,count(distinct id) from t1 group by dummy1;
|
|
dummy1 count(distinct id)
|
|
NULL 1
|
|
update t1 set id=-1 where id=1;
|
|
LOCK TABLE t1 READ;
|
|
update t1 set id=1 where id=1;
|
|
ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
|
|
create table t2 SELECT * from t1;
|
|
ERROR HY000: Table 't2' was not locked with LOCK TABLES
|
|
create temporary table t2 SELECT * from t1;
|
|
drop table if exists t2;
|
|
unlock tables;
|
|
create table t2 SELECT * from t1;
|
|
LOCK TABLE t1 WRITE,t2 write;
|
|
insert into t2 SELECT * from t1;
|
|
update t1 set id=1 where id=-1;
|
|
drop table t1,t2;
|
|
CREATE TABLE t1 (
|
|
index1 smallint(6) default NULL,
|
|
nr smallint(6) default NULL,
|
|
KEY index1(index1)
|
|
) ENGINE=MyISAM;
|
|
CREATE TABLE t2 (
|
|
nr smallint(6) default NULL,
|
|
name varchar(20) default NULL
|
|
) ENGINE=MyISAM;
|
|
INSERT INTO t2 VALUES (1,'item1');
|
|
INSERT INTO t2 VALUES (2,'item2');
|
|
lock tables t1 write, t2 read;
|
|
insert into t1 select 1,nr from t2 where name='item1';
|
|
insert into t1 select 2,nr from t2 where name='item2';
|
|
unlock tables;
|
|
check table t1;
|
|
Table Op Msg_type Msg_text
|
|
test.t1 check status OK
|
|
lock tables t1 write;
|
|
check table t2;
|
|
Table Op Msg_type Msg_text
|
|
test.t2 check Error Table 't2' was not locked with LOCK TABLES
|
|
test.t2 check error Corrupt
|
|
insert into t1 select index1,nr from t1;
|
|
ERROR HY000: Table 't1' was not locked with LOCK TABLES
|
|
unlock tables;
|
|
lock tables t1 write, t1 as t1_alias read;
|
|
insert into t1 select index1,nr from t1 as t1_alias;
|
|
drop table t1,t2;
|
|
create table t1 (c1 int);
|
|
create table t2 (c1 int);
|
|
create table t3 (c1 int);
|
|
lock tables t1 write, t2 write, t3 write;
|
|
drop table t2, t3, t1;
|
|
create table t1 (c1 int);
|
|
create table t2 (c1 int);
|
|
create table t3 (c1 int);
|
|
lock tables t1 write, t2 write, t3 write, t1 as t4 read;
|
|
alter table t2 add column c2 int;
|
|
drop table t1, t2, t3;
|
|
create table t1 ( a int(11) not null auto_increment, primary key(a));
|
|
create table t2 ( a int(11) not null auto_increment, primary key(a));
|
|
lock tables t1 write, t2 read;
|
|
delete from t1 using t1,t2 where t1.a=t2.a;
|
|
delete t1 from t1,t2 where t1.a=t2.a;
|
|
delete from t2 using t1,t2 where t1.a=t2.a;
|
|
ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
|
|
delete t2 from t1,t2 where t1.a=t2.a;
|
|
ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
|
|
drop table t1,t2;
|