mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
aa81e025a8
- Adding %M my_sprintf() modifier that prints error number - system-error-text - Modified mysys, mysql_client and SQL error messages to use %M instead of %d - Added my_strerror() Updated handler errors to 5.6 error numbers Updated text for a few error messages (to match 5.6) Increased length of command name in error output extra/comp_err.c: Added support for %M include/my_base.h: Updated handler errors to 5.6 error numbers include/my_sys.h: Added my_strerror() libmysql/errmsg.c: Updated error messages to use %M mysql-test/r/errors.result: Updated result as error message have changed mysql-test/r/innodb_mysql_sync.result: Updated result with text for errno mysql-test/r/myisam-system.result: Updated result with text for errno mysql-test/r/myisam.result: Updated result as error message have changed mysql-test/r/myisampack.result: Updated result with text for errno mysql-test/r/mysql.result: Updated result with text for errno mysql-test/r/mysql_upgrade.result: Updated result with text for errno mysql-test/r/partition_datatype.result: Updated result as error message have changed mysql-test/r/partition_innodb_plugin.result: Updated result with text for errno mysql-test/r/ps_1general.result: Updated result with text for errno mysql-test/r/trigger.result: Updated result with text for errno mysql-test/r/type_bit.result: Updated result as error message have changed mysql-test/r/type_bit_innodb.result: Updated result as error message have changed mysql-test/r/type_blob.result: Updated result as error message have changed mysql-test/suite/archive/archive.result: Updated result with text for errno mysql-test/suite/binlog/r/binlog_index.result: Updated result with text for errno mysql-test/suite/binlog/r/binlog_ioerr.result: Updated result with text for errno mysql-test/suite/csv/csv.result: Updated result with text for errno mysql-test/suite/federated/federated_bug_35333.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-create-options.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-index.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb-zip.result: Updated result as error message have changed mysql-test/suite/innodb/r/innodb.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug21704.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug46000.result: Updated result with text for errno mysql-test/suite/innodb/r/innodb_bug53591.result: Updated result as error message have changed mysql-test/suite/innodb/r/innodb_corrupt_bit.result: New error numbers mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result: Updated result as error message have changed mysql-test/suite/innodb/t/innodb-create-options.test: Added regexp to avoid system error text mysql-test/suite/innodb/t/innodb-zip.test: Added regexp to avoid system error text mysql-test/suite/maria/maria-recovery2.result: Updated supression rule mysql-test/suite/maria/maria-recovery2.test: Updated supression rule mysql-test/suite/maria/maria.result: Updated result as error message have changed mysql-test/suite/parts/r/partition_bit_innodb.result: Updated result as error message have changed mysql-test/suite/parts/r/partition_bit_myisam.result: Updated result as error message have changed mysql-test/suite/percona/percona_innodb_fake_changes.result: Updated result with text for errno mysql-test/suite/perfschema/r/dml_cond_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_current.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_history.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_events_waits_history_long.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_by_instance.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_by_thread_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_ews_global_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_summary_by_event_name.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_file_summary_by_instance.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_mutex_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_performance_timers.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_rwlock_instances.result: Updated result as error message have changed mysql-test/suite/perfschema/r/dml_threads.result: Updated result as error message have changed mysql-test/suite/perfschema/r/misc.result: Updated result with text for errno mysql-test/suite/perfschema/r/privilege.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_EE_err.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_binlog_errors.result: Updated result with text for errno mysql-test/suite/rpl/r/rpl_drop_db.result: Updated result with text for errno mysys/errors.c: Updated error messages to use %M Changed all errors to use Errcode: consistenly mysys/my_handler_errors.h: Updated handler errors to 5.6 error numbers sql/share/errmsg-utf8.txt: Updated error messages to use %M sql/sys_vars.cc: Added error number to ER_EVENT_SET_VAR_ERROR strings/my_vsnprintf.c: Added %M my_sprintf() modifier that prints error number - system-error-text Simplify code Movied common code to function Removed some casts that was not necessary when reading integer/unsigned int stored in longlong Added my_strerror() unittest/mysys/my_vsnprintf-t.c: Added testing of %M
147 lines
4.8 KiB
Text
147 lines
4.8 KiB
Text
call mtr.add_suppression("File '.*aria_log.000.*' not found \\(Errcode: 2 .*\\)");
|
|
call mtr.add_suppression("Table '.\/mysqltest\/t_corrupted1' is crashed, skipping it. Please repair it with aria_chk -r");
|
|
set global aria_log_file_size=4294959104;
|
|
drop database if exists mysqltest;
|
|
create database mysqltest;
|
|
use mysqltest;
|
|
* TEST of removing logs manually
|
|
* shut down mysqld, removed logs, restarted it
|
|
* TEST of UNDO_ROW_DELETE preserving rowid
|
|
create table t1(a int) engine=aria;
|
|
insert into t1 values(1),(2);
|
|
flush table t1;
|
|
* copied t1 for comparison
|
|
lock tables t1 write;
|
|
insert into t1 values(3);
|
|
delete from t1 where a in (1,2,3);
|
|
SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_crash";
|
|
* crashing mysqld intentionally
|
|
set global aria_checkpoint_interval=1;
|
|
ERROR HY000: Lost connection to MySQL server during query
|
|
* recovery happens
|
|
check table t1 extended;
|
|
Table Op Msg_type Msg_text
|
|
mysqltest.t1 check status OK
|
|
* testing that checksum after recovery is as expected
|
|
Checksum-check
|
|
ok
|
|
use mysqltest;
|
|
drop table t1;
|
|
* TEST of checkpoint
|
|
set global debug_dbug="+d,info,query,enter,exit,loop,maria_checkpoint_indirect";
|
|
set global aria_checkpoint_interval=10000;
|
|
create table t1(a int, b varchar(10), index(a,b)) engine=aria;
|
|
insert into t1 values(1,"a"),(2,"b"),(3,"c");
|
|
delete from t1 where b="b";
|
|
update t1 set b="d" where a=1;
|
|
flush table t1;
|
|
* copied t1 for comparison
|
|
lock tables t1 write;
|
|
insert into t1 values(4,"e"),(5,"f"),(6,"g");
|
|
update t1 set b="h" where a=5;
|
|
delete from t1 where b="g";
|
|
show status like "Aria_pagecache_blocks_not_flushed";
|
|
Variable_name Value
|
|
Aria_pagecache_blocks_not_flushed 3
|
|
set global aria_checkpoint_interval=10000;
|
|
update t1 set b="i" where a=5;
|
|
SET SESSION debug_dbug="+d,maria_crash";
|
|
* crashing mysqld intentionally
|
|
set global aria_checkpoint_interval=1;
|
|
ERROR HY000: Lost connection to MySQL server during query
|
|
* recovery happens
|
|
check table t1 extended;
|
|
Table Op Msg_type Msg_text
|
|
mysqltest.t1 check status OK
|
|
* testing that checksum after recovery is as expected
|
|
Checksum-check
|
|
ok
|
|
use mysqltest;
|
|
drop table t1;
|
|
Test of REPAIR's implicit commit
|
|
create table t1 (a varchar(100), key(a)) engine=aria;
|
|
insert into t1 values(3);
|
|
flush table t1;
|
|
* copied t1 for comparison
|
|
lock tables t1 write;
|
|
insert into t1 values (1);
|
|
repair table t1;
|
|
Table Op Msg_type Msg_text
|
|
mysqltest.t1 repair status OK
|
|
insert into t1 values(2);
|
|
select * from t1;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
|
|
* crashing mysqld intentionally
|
|
set global aria_checkpoint_interval=1;
|
|
ERROR HY000: Lost connection to MySQL server during query
|
|
* recovery happens
|
|
check table t1 extended;
|
|
Table Op Msg_type Msg_text
|
|
mysqltest.t1 check status OK
|
|
* testing that checksum after recovery is as expected
|
|
Checksum-check
|
|
failure
|
|
use mysqltest;
|
|
select * from t1;
|
|
a
|
|
1
|
|
3
|
|
drop table t1;
|
|
* TEST of recovery when crash before bulk-insert-with-repair is committed
|
|
create table t1 (a varchar(100), key(a)) engine=aria;
|
|
create table t2 (a varchar(100)) engine=myisam;
|
|
set rand_seed1=12, rand_seed2=254;
|
|
insert into t2 values (rand());
|
|
insert into t2 select (rand()) from t2;
|
|
insert into t2 select (rand()) from t2;
|
|
insert into t2 select (rand()) from t2;
|
|
insert into t2 select (rand()) from t2;
|
|
insert into t2 select (rand()) from t2;
|
|
insert into t2 select (rand()) from t2;
|
|
insert into t1 values(30);
|
|
flush table t1;
|
|
* copied t1 for comparison
|
|
lock tables t1 write, t2 read;
|
|
delete from t1 limit 1;
|
|
insert into t1 select * from t2;
|
|
SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash";
|
|
* crashing mysqld intentionally
|
|
set global aria_checkpoint_interval=1;
|
|
ERROR HY000: Lost connection to MySQL server during query
|
|
* recovery happens
|
|
check table t1 extended;
|
|
Table Op Msg_type Msg_text
|
|
mysqltest.t1 check status OK
|
|
* testing that checksum after recovery is as expected
|
|
Checksum-check
|
|
ok
|
|
use mysqltest;
|
|
show keys from t1;
|
|
Table Non_unique Key_name Seq_in_index Column_name Collation Cardinality Sub_part Packed Null Index_type Comment Index_comment
|
|
t1 1 a 1 a A 1 NULL NULL YES BTREE
|
|
drop table t1;
|
|
* TEST of recovery when OPTIMIZE has replaced the index file and crash
|
|
create table t_corrupted1 (a varchar(100), key(a)) engine=aria;
|
|
insert into t_corrupted1 select (rand()) from t2;
|
|
flush table t_corrupted1;
|
|
* copied t_corrupted1 for comparison
|
|
SET SESSION debug_dbug="+d,maria_flush_whole_log,maria_flush_whole_page_cache,maria_crash_sort_index";
|
|
* crashing mysqld intentionally
|
|
optimize table t_corrupted1;
|
|
ERROR HY000: Lost connection to MySQL server during query
|
|
* recovery happens
|
|
check table t_corrupted1 extended;
|
|
Table Op Msg_type Msg_text
|
|
mysqltest.t_corrupted1 check warning Last repair was aborted before finishing
|
|
mysqltest.t_corrupted1 check status OK
|
|
* testing that checksum after recovery is as expected
|
|
Checksum-check
|
|
ok
|
|
use mysqltest;
|
|
drop table t_corrupted1, t2;
|
|
drop database mysqltest_for_comparison;
|
|
drop database mysqltest;
|