1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#48738: post-push fix. Multi-platform test improvements, mainly

Browse Source 
to make the test run gracefully on windows.

There was also a syntax error in windows part of the test.
This commit is contained in:
Luis Soares 2009-12-24 15:20:58 +00:00
parent b640b8f036
commit 6d96d334fa
2 changed files with 29 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/binlog_delete_and_flush_index.result
View File

@ -2,7 +2,9 @@ RESET MASTER;
CREATE TABLE t1 (a int); CREATE TABLE t1 (a int);
### assertion: index file contains regular entries ### assertion: index file contains regular entries
SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index'); SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index');
master-bin.000001 SELECT @index;
@index
MYSQLD_DATADIR/master-bin.000001
### assertion: show original binlogs ### assertion: show original binlogs
show binary logs; show binary logs;
@ -15,8 +17,10 @@ master-bin.000001 # Query # # use `test`; CREATE TABLE t1 (a int)
FLUSH LOGS; FLUSH LOGS;
### assertion: index file contains renamed binlog and the new one ### assertion: index file contains renamed binlog and the new one
SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index'); SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index');
master-bin-b34582.000001 SELECT @index;
master-bin.000002 @index
MYSQLD_DATADIR/master-bin-b34582.000001
MYSQLD_DATADIR/master-bin.000002
### assertion: original binlog content still exists, despite we ### assertion: original binlog content still exists, despite we
### renamed and changed the index file ### renamed and changed the index file
@ -39,6 +43,8 @@ master-bin.000002 #
### assertion: assert that not purged binlog file exists ### assertion: assert that not purged binlog file exists
### assertion: show index file contents and these should match show binary logs issued above ### assertion: show index file contents and these should match show binary logs issued above
SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index'); SET @index=LOAD_FILE('MYSQLD_DATADIR/master-bin.index');
master-bin.000002 SELECT @index;
@index
MYSQLD_DATADIR/master-bin.000002
RESET MASTER; RESET MASTER;

95
mysql-test/t/binlog_delete_and_flush_index.test
View File

@ -45,31 +45,10 @@ RESET MASTER;
CREATE TABLE t1 (a int); CREATE TABLE t1 (a int);
-- echo ### assertion: index file contains regular entries -- echo ### assertion: index file contains regular entries
-- replace_regex /[\\\/].*master/MYSQLD_DATADIR\/master/ -- replace_result $datadir MYSQLD_DATADIR
-- eval SET @index=LOAD_FILE('$index') -- eval SET @index=LOAD_FILE('$index')
if (`SELECT convert(@@version_compile_os using latin1) -- replace_result $datadir MYSQLD_DATADIR
IN ('Win32','Win64','Windows')`) SELECT @index;
{
-- disable_query_log
-- disable_result_log
-- let $a= `SELECT REPLACE (@index, '$datadir\', '')`
-- enable_result_log
-- enable_query_log
-- echo $a
}
if (!`SELECT convert(@@version_compile_os using latin1)
IN ('Win32','Win64','Windows')`)
{
-- disable_query_log
-- disable_result_log
-- let $a= `SELECT REPLACE (@index, '$datadir/', '')`
-- enable_result_log
-- enable_query_log
-- echo $a
}
--echo ### assertion: show original binlogs --echo ### assertion: show original binlogs
-- source include/show_binary_logs.inc -- source include/show_binary_logs.inc
@ -79,17 +58,23 @@ if (!`SELECT convert(@@version_compile_os using latin1)
# action: copy binlogs to other names and change entries in index file # action: copy binlogs to other names and change entries in index file
-- copy_file $datadir/master-bin.000001 $datadir/master-bin-b34582.000001 -- copy_file $datadir/master-bin.000001 $datadir/master-bin-b34582.000001
-- let newbinfile=$datadir/master-bin-b34582.000001 -- let newbinfile= $datadir/master-bin-b34582.000001
let INDEX_FILE=$index; -- let INDEX_FILE= $index
perl; perl;
$newbinfile= $ENV{'newbinfile'}; use File::Spec;
$newbinfile= File::Spec->rel2abs($ENV{'newbinfile'});
$file= $ENV{'INDEX_FILE'}; $file= $ENV{'INDEX_FILE'};
open(FILE, ">$file") || die "Unable to open $file."; open(FILE, ">$file") || die "Unable to open $file.";
truncate(FILE,0); truncate(FILE,0);
print FILE $newbinfile . "\n"; print FILE "$newbinfile";
close ($file); close ($file);
EOF EOF
# append a new line (platform independent)
-- append_file $index
EOF
# action: should cause rotation, and creation of new binlogs # action: should cause rotation, and creation of new binlogs
FLUSH LOGS; FLUSH LOGS;
@ -97,31 +82,10 @@ FLUSH LOGS;
-- remove_file $datadir/master-bin.000001 -- remove_file $datadir/master-bin.000001
-- echo ### assertion: index file contains renamed binlog and the new one -- echo ### assertion: index file contains renamed binlog and the new one
-- replace_regex /[\\\/].*master/MYSQLD_DATADIR\/master/ -- replace_result $datadir MYSQLD_DATADIR
-- eval SET @index=LOAD_FILE('$index') -- eval SET @index=LOAD_FILE('$index')
if (`SELECT convert(@@version_compile_os using latin1) -- replace_result $datadir MYSQLD_DATADIR
IN ('Win32','Win64','Windows')`) SELECT @index;
{
-- disable_query_log
-- disable_result_log
-- let $a= `SELECT REPLACE (@index, '$datadir\', '')`
-- enable_result_log
-- enable_query_log
-- echo $a
}
if (!`SELECT convert(@@version_compile_os using latin1)
IN ('Win32','Win64','Windows')`)
{
-- disable_query_log
-- disable_result_log
-- let $a= `SELECT REPLACE (@index, '$datadir/', '')`
-- enable_result_log
-- enable_query_log
-- echo $a
}
-- echo ### assertion: original binlog content still exists, despite we -- echo ### assertion: original binlog content still exists, despite we
-- echo ### renamed and changed the index file -- echo ### renamed and changed the index file
@ -147,30 +111,9 @@ DROP TABLE t1;
-- file_exists $datadir/$current_binlog -- file_exists $datadir/$current_binlog
-- echo ### assertion: show index file contents and these should match show binary logs issued above -- echo ### assertion: show index file contents and these should match show binary logs issued above
-- replace_regex /[\\\/].*master/MYSQLD_DATADIR\/master/ -- replace_result $datadir MYSQLD_DATADIR
-- eval SET @index=LOAD_FILE('$index') -- eval SET @index=LOAD_FILE('$index')
if (`SELECT convert(@@version_compile_os using latin1) -- replace_result $datadir MYSQLD_DATADIR
IN ('Win32','Win64','Windows')`) SELECT @index;
{
-- disable_query_log
-- disable_result_log
-- let $a= `SELECT REPLACE (@index, '$datadir\', '')`
-- enable_result_log
-- enable_query_log
-- echo $a
}
if (!`SELECT convert(@@version_compile_os using latin1)
IN ('Win32','Win64','Windows')`)
{
-- disable_query_log
-- disable_result_log
-- let $a= `SELECT REPLACE (@index, '$datadir/', '')`
-- enable_result_log
-- enable_query_log
-- echo $a
}
RESET MASTER; RESET MASTER;