database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.

Browse Source 
There were so many changes into mtr (this is the new mtr coming) that I rather
copied mtr from 6.0-main here (at least this one knows how to run Maria tests).
I also fixed suite/maria tests to be accepted by the new mtr.

mysys/thr_mutex.c:
  adding DBUG_PRINT here, so that we can locate where the warning is issued.
This commit is contained in:
Guilhem Bichot
2009-02-12 15:08:56 +01:00
parent 2637dda668 a5e5b0180a
commit 704b4845aa
1658 changed files with 37656 additions and 20494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
mysql-test/include/maria_empty_logs.inc
View File

@@ -6,10 +6,14 @@
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/master0.expect;
append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
wait-maria_empty_logs.inc
EOF
@@ -17,60 +21,63 @@ EOF
if (!$mel_keep_control_file)
{
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log_control;
--error 0,1
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log_control;
}
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000001;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000001;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000002;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000002;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000003;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000003;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000004;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000004;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000005;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000005;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000006;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000006;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000007;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000007;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000008;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000008;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000009;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000009;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000010;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000010;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000011;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000011;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000012;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000012;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000013;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000013;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000014;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000014;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000015;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000015;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000016;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000016;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000017;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000017;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000018;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000018;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000019;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000019;
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/$MARIA_LOG/maria_log.00000020;
remove_file $MYSQLD_DATADIR/$MARIA_LOG/maria_log.00000020;
# hope there are not more than these logs...
-- error 0,1
remove_file $MYSQLTEST_VARDIR/master-data/maria_recovery.trace;
remove_file $MYSQLD_DATADIR/maria_recovery.trace;
append_file $MYSQLTEST_VARDIR/tmp/master0.expect;
append_file $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
restart-maria_empty_logs.inc
EOF
--source include/wait_until_connected_again.inc
connection default;
# Make sure that all connections are restored
--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;