mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

automerge

Browse source
This commit is contained in:
Georgi Kodinov 2009-06-12 17:04:24 +03:00
commit ed112a8049
4 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
mysql-test/suite/rpl/t/disabled.def
View file

@ -11,4 +11,3 @@
############################################################################## ##############################################################################
rpl_cross_version : Bug#42311 2009-03-27 joro rpl_cross_version fails on macosx rpl_cross_version : Bug#42311 2009-03-27 joro rpl_cross_version fails on macosx
rpl_init_slave : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows

6
mysql-test/suite/rpl/t/rpl_init_slave.test
View file

@ -1,3 +1,9 @@
if(`SELECT CONVERT(@@version_compile_os using latin1) IN ("Win32", "Win64", "Windows")`)
{
--skip Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows
}
source include/master-slave.inc; source include/master-slave.inc;
# #

1
mysql-test/t/disabled.def
View file

@ -12,4 +12,3 @@
kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild. kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
innodb_bug39438 : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently" innodb_bug39438 : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently"
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
init_connect : Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows

5
mysql-test/t/init_connect.test
View file

@ -2,6 +2,11 @@
# Test of init_connect variable # Test of init_connect variable
# #
if(`SELECT CONVERT(@@version_compile_os using latin1) IN ("Win32", "Win64", "Windows")`)
{
--skip Bug#44920 2009-05-18 pcrews MTR2 is not processing master.opt input properly on Windows
}
# should work with embedded server after mysqltest is fixed # should work with embedded server after mysqltest is fixed
--source include/not_embedded.inc --source include/not_embedded.inc