mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 08:44:33 +01:00
1bee590347
Removed random failures from test suite mysql-test/extra/rpl_tests/rpl_insert_id_pk.test: Make test predicatable. mysql-test/include/maria_empty_logs.inc: We can't use 'Threads_connected' for syncronization, as the 'check_warnings' thread that just quit may still be counted in 'Threads_connected' Now we just wait until MySQLD answers again, which should be good enough for our purposes mysql-test/suite/binlog/r/binlog_index.result: Updated results file mysql-test/suite/binlog/t/binlog_index-master.opt: Added option file to not get stack traces in .err file. mysql-test/suite/binlog/t/binlog_index.test: Added 'flush tables' to remove warning about crashed suppression file from logs mysql-test/suite/pbxt/r/multi_statement.result: Updated results mysql-test/suite/pbxt/t/multi_statement-master.opt: Added options so that slow query testing makes sense sql/events.cc: Don't write Event Scheduler startup message if warnings are turned off. sql/handler.cc: Removed compiler warning sql/log.cc: Removed compiler warning sql/mysqld.cc: Added option 'test-expect-abort'; If this is set, we don't write message to log in case of 'DBUG_ABORT'. (Gives us smaller, easier to read log files) sql/set_var.cc: Removed compiler warning sql/slave.cc: Removed compiler warning sql/sql_plugin.cc: Don't write warnings about disabled plugin if using --log_warnings=0 storage/xtradb/include/ut0lst.h: Removed compiler warning support-files/compiler_warnings.supp: Supress warning from xtradb
92 lines
2.9 KiB
PHP
92 lines
2.9 KiB
PHP
# Maria help script.
|
|
# Cleans up all logs to give recovery a fresh start.
|
|
#
|
|
# Note that this script relies on the number of threads connect at start of
|
|
# this script, so one should run this script with a freshly started server
|
|
# for it to work.
|
|
#
|
|
# API: set mel_keep_control_file=1 if want to keep control file;
|
|
# uses vardir, port and socket.
|
|
|
|
connection default;
|
|
let $default_db=`select database()`;
|
|
let $MYSQLD_DATADIR= `SELECT @@datadir`;
|
|
|
|
#it will used at end of test for wait_for_status_var.inc primitive
|
|
#let $status_var= Threads_connected;
|
|
#let $status_var_value= query_get_value(SHOW STATUS LIKE 'Threads_connected', Value, 1);
|
|
|
|
connection admin;
|
|
-- echo * shut down mysqld, removed logs, restarted it
|
|
append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
|
|
wait-maria_empty_logs.inc
|
|
EOF
|
|
|
|
--source include/mysqladmin_shutdown.inc
|
|
|
|
if (!$mel_keep_control_file)
|
|
{
|
|
--error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control;
|
|
}
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000001;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000002;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000003;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000004;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000005;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000006;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000007;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000008;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000009;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000010;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000011;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000012;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000013;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000014;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000015;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000016;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000017;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000018;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000019;
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000020;
|
|
# hope there are not more than these logs...
|
|
|
|
-- error 0,1
|
|
remove_file $MYSQLD_DATADIR/maria_recovery.trace;
|
|
|
|
append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
|
|
restart-maria_empty_logs.inc
|
|
EOF
|
|
|
|
connection default;
|
|
--source include/wait_until_connected_again.inc
|
|
|
|
# Make sure that all connections are restored
|
|
# This is disabled as 'Threads_connected' can't be trusted'
|
|
# (It may be affected by 'check_testcase()')
|
|
# --source include/wait_for_status_var.inc
|
|
# Restore current database as the effect of "use" was lost after restart
|
|
|
|
--disable_query_log
|
|
eval use $default_db;
|
|
--enable_query_log
|