Vladislav Vaintroub
ac3a0f0df6
merge, CMake bugfixes, remove sp-error from experimental
2010-02-23 13:50:45 +01:00
Vladislav Vaintroub
e605213c2a
Bug#51393 : remove mtr_fix_privilege_tables from MTR v1
2010-02-22 19:39:36 +01:00
Alexander Nozdrin
77c6baf612
Auto-merge from mysql-next-mr.
2010-02-20 12:40:21 +03:00
Bjorn Munch
547f9acd52
Bug #51248 Server start fails with MTR_VERSION=1 and code with WL5154
...
Replaced --default-character-set with --character-set-server
Replaced --language with --lc-messages-dir
NB full test suite not tested yet
2010-02-17 19:08:49 +01:00
Alexander Nozdrin
ddc8765a9e
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
f86766c82b
upmerge 49210
2010-01-28 13:02:19 +01:00
Bjorn Munch
a09d8b7802
upmerge 49210
2010-01-28 13:01:01 +01:00
Bjorn Munch
f363fece5e
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
Bjorn Munch
da1aab425b
merge from next-mr
2010-01-19 13:35:23 +01:00
Tor Didriksen
42c5cff706
Follup fix for WL#4738
2010-01-06 16:21:43 +01:00
Bjorn Munch
b40dd1e592
Merge from next-mr
2009-12-16 12:14:14 +01:00
Bjorn Munch
4deb53a56d
Bug #49096 mtr: --mem option should be ignored on Windows
...
Ignored w/message in v1 and v2
2009-11-26 11:23:30 +01:00
Luis Soares
20e7e3a6b9
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
d2773d34f5
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
