database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Fix for binlog_index test case: hide difference for paths from warning messages between Windows and Unix

Browse Source 
mysql-test/suite/binlog/r/binlog_index.result:
  updated result
mysql-test/suite/binlog/t/binlog_index.test:
  updated test case
This commit is contained in:
unknown
2008-04-05 15:09:53 +04:00
parent b99da620d6
commit d50ded3db8
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/binlog/r/binlog_index.result
View File

@ -9,7 +9,7 @@ master-bin.000003 #
master-bin.000004 # master-bin.000004 #
purge binary logs TO 'master-bin.000004'; purge binary logs TO 'master-bin.000004';
Warnings: Warnings:
Warning 1612 Being purged log ./master-bin.000001 was not found Warning 1612 Being purged log master-bin.000001 was not found
*** must show a list starting from the 'TO' argument of PURGE *** *** must show a list starting from the 'TO' argument of PURGE ***
show binary logs; show binary logs;
Log_name File_size Log_name File_size
@ -20,7 +20,7 @@ flush logs;
flush logs; flush logs;
*** must be a warning master-bin.000001 was not found *** *** must be a warning master-bin.000001 was not found ***
Warnings: Warnings:
Warning 1612 Being purged log ./master-bin.000001 was not found Warning 1612 Being purged log master-bin.000001 was not found
*** must show one record, of the active binlog, left in the index file after PURGE *** *** must show one record, of the active binlog, left in the index file after PURGE ***
show binary logs; show binary logs;
Log_name File_size Log_name File_size
@ -33,7 +33,7 @@ purge binary logs TO 'master-bin.000002';
ERROR HY000: Fatal error during log purge ERROR HY000: Fatal error during log purge
show warnings; show warnings;
Level Code Message Level Code Message
Error 1377 a problem with deleting ./master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files Error 1377 a problem with deleting master-bin.000001; consider examining correspondence of your binlog index file to the actual binlog files
Error 1377 Fatal error during log purge Error 1377 Fatal error during log purge
reset master; reset master;
End of tests End of tests

4
mysql-test/suite/binlog/t/binlog_index.test
View File

@ -13,11 +13,11 @@ flush logs;
flush logs; flush logs;
source include/show_binary_logs.inc; source include/show_binary_logs.inc;
let $MYSQLD_DATADIR= `select @@datadir`; let $MYSQLD_DATADIR= `select @@datadir`;
remove_file $MYSQLD_DATADIR/master-bin.000001; remove_file $MYSQLD_DATADIR/master-bin.000001;
# there must be a warning with file names # there must be a warning with file names
replace_regex /\.[\\\/]master/master/;
purge binary logs TO 'master-bin.000004'; purge binary logs TO 'master-bin.000004';
--echo *** must show a list starting from the 'TO' argument of PURGE *** --echo *** must show a list starting from the 'TO' argument of PURGE ***
@ -37,6 +37,7 @@ remove_file $MYSQLD_DATADIR/master-bin.000001;
--echo *** must be a warning master-bin.000001 was not found *** --echo *** must be a warning master-bin.000001 was not found ***
let $date=`select NOW() + INTERVAL 1 MINUTE`; let $date=`select NOW() + INTERVAL 1 MINUTE`;
--disable_query_log --disable_query_log
replace_regex /\.[\\\/]master/master/;
eval purge binary logs BEFORE '$date'; eval purge binary logs BEFORE '$date';
--enable_query_log --enable_query_log
@ -59,6 +60,7 @@ mkdir $MYSQLD_DATADIR/master-bin.000001;
--error ER_BINLOG_PURGE_FATAL_ERR --error ER_BINLOG_PURGE_FATAL_ERR
purge binary logs TO 'master-bin.000002'; purge binary logs TO 'master-bin.000002';
replace_regex /\.[\\\/]master/master/;
show warnings; show warnings;
rmdir $MYSQLD_DATADIR/master-bin.000001; rmdir $MYSQLD_DATADIR/master-bin.000001;
--disable_warnings --disable_warnings