5 Commits

Author	SHA1	Message	Date
Alexander Nozdrin	2b0f6b5ace	Manual merge from mysql-trunk-merge. ... Conflicts: - mysql-test/suite/rpl/r/rpl_binlog_grant.result - mysql-test/suite/rpl/r/rpl_sp.result - mysql-test/suite/rpl/t/rpl_binlog_grant.test - sql/sql_parse.cc - sql/sql_table.cc - sql/sql_test.cc	2010-01-31 01:06:50 +03:00
Bjorn Munch	38e924b995	Bug #49210 Enable MTR timeout configuration through environment variables ... Define env. vars for both timeout settings Also incorporated 5.0 patch into mtr version 1	2010-01-27 16:32:59 +01:00
Tor Didriksen	2ac6690200	Follup fix for WL#4738	2010-01-06 16:21:43 +01:00
Luis Soares	625ddcd5ec	BUG#48048: Deprecated constructs need removal in Betony ... Post-push fix: Removed MTRv1 arguments according to the original patch. Although there is a version check, the patch was pushed to a 5.1 GA staging tree, while the version check considers version 5.2. This makes the deprecated parameters to be used, despite the fact that they are not valid anymore. Part of MTRv1 is currently used in RQG semisync test, and this was causing the test to fail on slave startup. It should be safe to uncomment when merging up to celosia.	2009-11-16 12:17:19 +00:00
Magnus Svensson	b454d067cb	WL#4189 Add full backward compatibility to mysql-test-run.pl ... - Add copy of mtr v1 and make it possible to run it using MTR_VERSION=1	2008-11-14 09:45:32 +01:00