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.
82 lines
2 KiB
Text
82 lines
2 KiB
Text
set SQL_LOG_BIN=0;
|
|
drop table if exists t1, t2, t3;
|
|
create table t4(n int);
|
|
backup table t4 to '../bogus';
|
|
Table Op Msg_type Msg_text
|
|
test.t4 backup error Failed copying .frm file (errno: X)
|
|
test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/bogus/t4.frm' (Errcode: X)
|
|
test.t4 backup status Operation failed
|
|
backup table t4 to '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t4 backup status OK
|
|
backup table t4 to '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t4 backup error Failed copying .frm file (errno: X)
|
|
test.t4 backup Error Can't create/write to file 'MYSQLTEST_VARDIR/tmp/t4.frm' (Errcode: X)
|
|
test.t4 backup status Operation failed
|
|
drop table t4;
|
|
restore table t4 from '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t4 restore status OK
|
|
select count(*) from t4;
|
|
count(*)
|
|
0
|
|
create table t1(n int);
|
|
insert into t1 values (23),(45),(67);
|
|
backup table t1 to '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t1 backup status OK
|
|
drop table t1;
|
|
restore table t1 from '../bogus';
|
|
Table Op Msg_type Msg_text
|
|
t1 restore error Failed copying .frm file
|
|
Warnings:
|
|
Error 29 File 'MYSQLTEST_VARDIR/bogus/t1.frm' not found (Errcode: X)
|
|
restore table t1 from '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t1 restore status OK
|
|
select n from t1;
|
|
n
|
|
23
|
|
45
|
|
67
|
|
create table t2(m int not null primary key);
|
|
create table t3(k int not null primary key);
|
|
insert into t2 values (123),(145),(167);
|
|
insert into t3 values (223),(245),(267);
|
|
backup table t2,t3 to '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t2 backup status OK
|
|
test.t3 backup status OK
|
|
drop table t1,t2,t3;
|
|
restore table t1,t2,t3 from '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t1 restore status OK
|
|
test.t2 restore status OK
|
|
test.t3 restore status OK
|
|
select n from t1;
|
|
n
|
|
23
|
|
45
|
|
67
|
|
select m from t2;
|
|
m
|
|
123
|
|
145
|
|
167
|
|
select k from t3;
|
|
k
|
|
223
|
|
245
|
|
267
|
|
drop table t1,t2,t3,t4;
|
|
restore table t1 from '../tmp';
|
|
Table Op Msg_type Msg_text
|
|
test.t1 restore status OK
|
|
rename table t1 to t5;
|
|
lock tables t5 write;
|
|
backup table t5 to '../tmp';
|
|
unlock tables;
|
|
Table Op Msg_type Msg_text
|
|
test.t5 backup status OK
|
|
drop table t5;
|