Alexander Nozdrin
455bcad07f
Automerge from mysql-trunk-bugfixing.
2009-10-27 13:05:40 +03:00
Alexander Nozdrin
cd56f6ffe9
Make rpl_timezone experimental due to Bug#47017.
2009-10-27 13:05:06 +03:00
Luis Soares
ba0afceb9e
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
75aa76072f
Added rpl_heartbeat_2slaves to experimental list.
2009-10-23 10:33:12 +01:00
Luis Soares
676832e05d
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
f1bb8c3c55
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
bcaa7524d9
Merge from mysql-trunk-merge.
2009-10-22 10:07:56 +04:00
Alexander Nozdrin
469ce38b99
Pass --vardir to MTR in mysql-trunk.push.
2009-10-22 10:05:53 +04:00
Alexander Nozdrin
336505395e
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
52701ff327
Merge from mysql-trunk-merge.
2009-10-21 00:27:37 +04:00
Alexander Nozdrin
265eee595b
Mark rpl.rpl_innodb_bug28430 experimental unconditionally.
2009-10-21 00:26:56 +04:00
Alexander Nozdrin
bd60794fd8
Merge from mysql-trunk-merge.
2009-10-19 17:36:19 +04:00
Alexander Nozdrin
03bf73de2f
Merge from mysql-5.1.
2009-10-19 17:28:31 +04:00
Georgi Kodinov
d6573fea19
All NDB tests made experimental after a discussion with Bernhard Ocklin.
2009-10-15 14:22:25 +03:00
Alexander Nozdrin
c30d924dd5
Manual merge from mysql-trunk-merge.
2009-10-14 12:25:39 +04:00
Alexander Nozdrin
c69629d269
Merge from mysql-5.1.
2009-10-13 13:42:38 +04:00
unknown
1994d2c11e
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
a89855c537
Merge from mysql-trunk-bugfixing.
2009-10-09 12:30:34 +04:00
Alexander Nozdrin
1031d8e7f1
Mark main.log_tables experimental (Bug 47924).
2009-10-08 23:13:33 +04:00
Georgi Kodinov
00968ae167
fixed typos in exeprimental list
2009-10-05 11:18:59 +03:00
Georgi Kodinov
39c7863dd6
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
103cd1898a
Make innodb-autoinc.test experimental until bug#47809 is fixed.
2009-10-04 13:16:56 +03:00
Alexander Nozdrin
d045cded3e
Merge from mysql-trunk-bugfixing.
2009-10-02 16:50:18 +04:00
Alexander Nozdrin
2a7edfbe9c
Made two test cases experimental.
2009-10-02 16:48:51 +04:00
Alexander Nozdrin
c7dd21688d
Merge from mysql-trunk-bugfixing.
2009-10-01 15:32:45 +04:00
Alexander Nozdrin
35d2352cfb
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
9922788d7a
Post-fix for BUG#43789
...
NOTE: Backporting the patch to next-mr.
2009-09-30 15:17:15 +01:00
Alexander Nozdrin
c991aa4e1a
Merge from mysql-trunl-alik.
2009-09-25 13:40:53 +04:00
Alexander Nozdrin
3f0caab6e5
Mark rpl.rpl_innodb_bug30888 experimental.
2009-09-25 13:40:25 +04:00
Alexander Nozdrin
20430985f9
Merge from mysql-trunl-alik.
2009-09-25 13:23:30 +04:00
Alexander Nozdrin
350fad0e46
Mark rpl.rpl_trigger experimental.
2009-09-25 13:21:49 +04:00
Alexander Nozdrin
f4b49e55cd
Merge from mysql-trunk-alik (stabilizing changes).
2009-09-24 16:40:09 +04:00
Alexander Nozdrin
b893cc510c
Disable ndb and rpl_ndb test suites from regular tests.
2009-09-24 16:30:13 +04:00
Alexander Nozdrin
45921153db
Mark some tests experimental.
...
Update default.conf.
2009-09-24 16:29:29 +04:00
Bjorn Munch
868d45c80f
merge from 5.1 of merge from 5.1-mtr
2009-09-22 23:41:37 +02:00
Bjorn Munch
bb181d25cb
new merge from trunk
2009-09-21 11:43:01 +02:00
Alexander Nozdrin
18f7dd0fad
Update default.experimental.
2009-09-20 01:09:02 +04:00
Alexander Nozdrin
9d8c023859
Mark some tests experimental.
2009-09-19 13:37:22 +04:00
Bjorn Munch
645f7841cf
followup fixes after merge to -trunk
2009-09-05 09:40:18 +02:00
Bjorn Munch
29a142043e
initial merge from 5.1-mtr
2009-09-04 15:20:58 +02:00
Bjorn Munch
31f9d5fd16
second merge from main, with adaptions
2009-09-02 23:29:11 +02:00
Bjorn Munch
a829604260
first merge from main
2009-09-02 18:58:17 +02:00
Georgi Kodinov
c6fd09d097
automerge 5.1-main -> 5.1-bugteam
2009-08-31 17:09:09 +03:00
Alexander Nozdrin
09d01ba615
Merge from mysql-5.1-bugteam
2009-08-26 19:43:32 +04:00
Bjorn Munch
2000cef72a
Bug #44979 Enhance MTR --experimental to support platform qualifier
...
Adding @<platform> syntax
2009-08-13 15:29:19 +02:00
Daniel Fischer
b50f05e67a
Create separate vardirs during collections test runs.
2009-08-12 17:10:15 +02:00
Davi Arnaut
1c2556ff46
Merge from mysql-5.0-bugteam.
2009-08-13 17:45:01 -03:00
Georgi Kodinov
c2ec53f94a
Bug#38998, Bug#46029, Bug#45243, Bug#46030 making tests experimental
2009-07-08 10:31:49 +03:00
Georgi Kodinov
c8c22c7a98
Bug #40796 : adding the tests to the experimental pb2 set.
2009-07-07 17:41:34 +03:00
Georgi Kodinov
6a2f91bff4
merge of making bug 45578, 46010 and 45576 experimental in pb2.
2009-07-07 17:15:53 +03:00
