Luis Soares
ec9aa90ad9
post-push fixes
...
Disabled rpl_cross_version (instead of setting it experimental).
Fixed outstanding warning fix in main.debug_sync.
2009-10-23 17:07:45 +01:00
Luis Soares
9ef305232f
Added rpl_heartbeat_2slaves to experimental list.
2009-10-23 10:33:12 +01:00
Luis Soares
ea858f1857
post-merge fixes: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
...
rpl.rpl_heartbeat_basic and rpl.rpl_cross_version set as experimental.
2009-10-22 23:46:04 +01:00
Luis Soares
58e2fde011
manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge
...
Conflicts
=========
Text conflict in .bzr-mysql/default.conf
Text conflict in libmysqld/CMakeLists.txt
Text conflict in libmysqld/Makefile.am
Text conflict in mysql-test/collections/default.experimental
Text conflict in mysql-test/extra/rpl_tests/rpl_row_sp006.test
Text conflict in mysql-test/suite/binlog/r/binlog_tmp_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata.result
Text conflict in mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_create_table.result
Text conflict in mysql-test/suite/rpl/r/rpl_row_sp006_InnoDB.result
Text conflict in mysql-test/suite/rpl/r/rpl_stm_log.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
Text conflict in mysql-test/suite/rpl_ndb/r/rpl_ndb_sp006.result
Text conflict in mysql-test/t/mysqlbinlog.test
Text conflict in sql/CMakeLists.txt
Text conflict in sql/Makefile.am
Text conflict in sql/log_event_old.cc
Text conflict in sql/rpl_rli.cc
Text conflict in sql/slave.cc
Text conflict in sql/sql_binlog.cc
Text conflict in sql/sql_lex.h
21 conflicts encountered.
NOTE
====
mysql-5.1-rpl-merge has been made a mirror of mysql-next-mr:
- "mysql-5.1-rpl-merge$ bzr pull ../mysql-next-mr"
This is the first cset (merge/...) committed after pulling
from mysql-next-mr.
2009-10-22 23:30:28 +01:00
Alexander Nozdrin
7e30baaa71
Merge from mysql-trunk-merge.
2009-10-22 10:07:56 +04:00
Alexander Nozdrin
8d953ecef1
Pass --vardir to MTR in mysql-trunk.push.
2009-10-22 10:05:53 +04:00
Alexander Nozdrin
c0718f032b
Disable the test in mysql-trunk because of Bug#46931
...
instead of making it experimental.
2009-10-22 10:01:23 +04:00
Alexander Nozdrin
479b602fd6
Merge from mysql-trunk-merge.
2009-10-21 00:27:37 +04:00
Alexander Nozdrin
9787943c5e
Mark rpl.rpl_innodb_bug28430 experimental unconditionally.
2009-10-21 00:26:56 +04:00
Alexander Nozdrin
3fd2f50b6c
Merge from mysql-trunk-merge.
2009-10-19 17:36:19 +04:00
Alexander Nozdrin
b930b18ec3
Merge from mysql-5.1.
2009-10-19 17:28:31 +04:00
Georgi Kodinov
ff5833d346
All NDB tests made experimental after a discussion with Bernhard Ocklin.
2009-10-15 14:22:25 +03:00
Alexander Nozdrin
ca08f10ccd
Manual merge from mysql-trunk-merge.
2009-10-14 12:25:39 +04:00
Alexander Nozdrin
0f51423532
Merge from mysql-5.1.
2009-10-13 13:42:38 +04:00
814a3cc246
Bug#45578: Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
...
The bug has been closed.
2009-10-13 10:26:15 +08:00
Alexander Nozdrin
4e3fbcd156
Merge from mysql-trunk-bugfixing.
2009-10-09 12:30:34 +04:00
Alexander Nozdrin
3f76ffd433
Mark main.log_tables experimental (Bug 47924).
2009-10-08 23:13:33 +04:00
Georgi Kodinov
67ac3fac7f
fixed typos in exeprimental list
2009-10-05 11:18:59 +03:00
Georgi Kodinov
5992e70623
rpl.rpl_trigger made experimental because of bug #47810 :
...
rpl.rpl_trigger.test fails with valgrind errors with the innodb plugin
2009-10-04 13:31:55 +03:00
Georgi Kodinov
b2511985ae
Make innodb-autoinc.test experimental until bug#47809 is fixed.
2009-10-04 13:16:56 +03:00
Alexander Nozdrin
2758bb8aa8
Merge from mysql-trunk-bugfixing.
2009-10-02 16:50:18 +04:00
Alexander Nozdrin
073c5a932d
Made two test cases experimental.
2009-10-02 16:48:51 +04:00
Alexander Nozdrin
dbab87af6a
Merge from mysql-trunk-bugfixing.
2009-10-01 15:32:45 +04:00
Alexander Nozdrin
83566cd4f1
1. Respect experimental tag in gcov mode;
...
2. Mark ndb, rpl_ndb test suites experimental.
2009-10-01 15:31:54 +04:00
Alfranio Correia
47599b5db2
Post-fix for BUG#43789
...
NOTE: Backporting the patch to next-mr.
2009-09-30 15:17:15 +01:00
Alexander Nozdrin
150511556f
Merge from mysql-trunl-alik.
2009-09-25 13:40:53 +04:00
Alexander Nozdrin
753b7c3d1d
Mark rpl.rpl_innodb_bug30888 experimental.
2009-09-25 13:40:25 +04:00
Alexander Nozdrin
bee4da8d23
Merge from mysql-trunl-alik.
2009-09-25 13:23:30 +04:00
Alexander Nozdrin
98b69441e7
Mark rpl.rpl_trigger experimental.
2009-09-25 13:21:49 +04:00
Alexander Nozdrin
19a223fee4
Merge from mysql-trunk-alik (stabilizing changes).
2009-09-24 16:40:09 +04:00
Alexander Nozdrin
ddaaeb6fad
Disable ndb and rpl_ndb test suites from regular tests.
2009-09-24 16:30:13 +04:00
Alexander Nozdrin
31189ee8be
Mark some tests experimental.
...
Update default.conf.
2009-09-24 16:29:29 +04:00
Bjorn Munch
726df480f9
merge from 5.1 of merge from 5.1-mtr
2009-09-22 23:41:37 +02:00
Bjorn Munch
59b1991bc0
new merge from trunk
2009-09-21 11:43:01 +02:00
Alexander Nozdrin
1ff8e28a3e
Update default.experimental.
2009-09-20 01:09:02 +04:00
Alexander Nozdrin
e68f09ab6b
Mark some tests experimental.
2009-09-19 13:37:22 +04:00
Bjorn Munch
e81e6f4bb9
followup fixes after merge to -trunk
2009-09-05 09:40:18 +02:00
Bjorn Munch
b5dd609a55
initial merge from 5.1-mtr
2009-09-04 15:20:58 +02:00
Bjorn Munch
39fca129fb
second merge from main, with adaptions
2009-09-02 23:29:11 +02:00
Bjorn Munch
588e9930b4
first merge from main
2009-09-02 18:58:17 +02:00
Georgi Kodinov
e926c448b8
automerge 5.1-main -> 5.1-bugteam
2009-08-31 17:09:09 +03:00
Alexander Nozdrin
37072db77b
Merge from mysql-5.1-bugteam
2009-08-26 19:43:32 +04:00
Bjorn Munch
9407780994
Bug #44979 Enhance MTR --experimental to support platform qualifier
...
Adding @<platform> syntax
2009-08-13 15:29:19 +02:00
Daniel Fischer
cb0df3eed7
Create separate vardirs during collections test runs.
2009-08-12 17:10:15 +02:00
Davi Arnaut
1cf02d95a7
Merge from mysql-5.0-bugteam.
2009-08-13 17:45:01 -03:00
Georgi Kodinov
cc636ed211
Bug#38998, Bug#46029, Bug#45243, Bug#46030 making tests experimental
2009-07-08 10:31:49 +03:00
Georgi Kodinov
15d63fe0a1
Bug #40796 : adding the tests to the experimental pb2 set.
2009-07-07 17:41:34 +03:00
Georgi Kodinov
2203af93f3
merge of making bug 45578, 46010 and 45576 experimental in pb2.
2009-07-07 17:15:53 +03:00
Bjorn Munch
912f971849
Bug #45256 Enable 'auto' for mtr --parallel
...
Let the user specify 'auto' for parallel value
Also set --parallel=auto in default.push so we can get this tested.
2009-06-03 12:46:04 +02:00
Bjorn Munch
763579e65b
Bug #43659 MTR2 should report worker data for tests when using --parallel > 1
...
Adding "w# " before the test result
Also enable --parallel=2 so this can be tested.
2009-05-28 13:02:03 +02:00
