mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-21 06:22:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
60284 commits 2781 branches 343 tags 1.6 GiB
Commit graph

84 commits

Author SHA1 Message Date
Alexey Kopytov
41b6e42421 Mark all main.plugin* tests as experimental on Solaris 
as done in 6.0 due to bug #47146.
 2010-03-23 23:34:12 +03:00
Alexey Kopytov
d2452095a5 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 
Conflicts:

Text conflict in .bzr-mysql/default.conf
Text conflict in mysql-test/r/explain.result
Text conflict in mysql-test/r/having.result
Text conflict in mysql-test/suite/rpl/t/disabled.def
Text conflict in mysql-test/suite/rpl/t/rpl_slave_skip.test
Text conflict in storage/federated/ha_federated.cc
 2010-03-07 19:40:59 +03:00
Georgi Kodinov
2e9045c8fd Moved the ndb related tests out of the per-push pb2 run to the daily pb2 run. 2010-03-02 14:43:21 +02:00
Alexander Nozdrin
0c01d8d86c Remove test from experimental because Bug 45578 and 46010 are fixed. 2010-03-02 10:22:33 +03:00
Magne Mahre
a83c305e43 Bug#47017 rpl_timezone fails on PB-2 with mismatch error 
This is a post-fix cleanup to move rpl.rpl_timezone out
of 'experimental' state.
 2010-02-17 22:17:17 +01:00
Alexander Nozdrin
adcda7df2b Mark some tests experimental. 2010-01-31 14:38:55 +03:00
Alexander Nozdrin
85c54dddc7 Manual merge from mysql-5.1-bugteam. 
Conflicts:
  - mysql-test/collections/default.experimental
  - 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
  - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
 2010-01-30 22:13:36 +03:00
Alexander Nozdrin
5594d64cf4 Make the following tests experimental: 
- main.outfile_loaddata @solaris due to Bug#46895
  - main.signal_demo3 @solaris due to Bug#47791
  - main.sp @solaris due to Bug#47791
  - rpl.rpl_slave_load_remove_tmpfile @windows due to Bug#50474
 2010-01-28 21:49:00 +03:00
73cfad9ff4 Bug #49191 rpl_get_master_version_and_clock failed on PB2: COM_REGISTER_SLAVE failed 
The 'rpl_get_master_version_and_clock' test verifies if the slave I/O
thread tries to reconnect to master when it tries to get the values of
the UNIX_TIMESTAMP, SERVER_ID from master under network disconnection.
So the master server is restarted for making the transient network
disconnection, during the period the COM_REGISTER_SLAVE failures are
produced in server log file when the slave I/O thread tries to
register on master.

To fix the problem, suppress COM_REGISTER_SLAVE failures in server log
file by mtr suppression, because they are expected.
 2010-01-27 10:52:13 +08:00
Georgi Kodinov
c3ba50ade1 merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
Georgi Kodinov
9544f9d1e3 Made outfile_testdata experimental in 5.1-bugteam, pending the 
resulution of bug #46895.
 2010-02-01 14:05:21 +02:00
Alexander Nozdrin
858cf5555c Disable plugin_load.test due to Bug#42144. 2009-12-21 13:20:43 +03:00
Satya B
3cab11960a Removing rpl.rpl_trigger from experimental list as it is Fixed by BUG#46656 2009-12-22 18:33:39 +05:30
Alexey Kopytov
72b2943594 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
Alexander Nozdrin
69cfd5c8ec Manual merge from mysql-trunk. 
Conflicts:
  - client/mysqltest.cc
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/t/disabled.def
  - sql/mysqld.cc
  - sql/opt_range.cc
  - sql/sp.cc
  - sql/sql_acl.cc
  - sql/sql_partition.cc
  - sql/sql_table.cc
 2009-12-11 12:39:38 +03:00
Luis Soares
1ee79014e3 Automerge bzr bundle from bug report. 
Removed rpl_cross_version from experimental list.
 2009-12-06 23:36:07 +00:00
Alexey Kopytov
616a09ed09 Disable the test case innodb-autonic.test until BUG#49267 is fixed 
Add the test to disabled list and remove from the experimental list.
 2009-12-04 13:54:43 +03:00
Alexey Kopytov
cf70d90a4d Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-03 23:46:06 +03:00
Satya B
317d0f76b6 Disable the test case innodb-autonic.test until BUG#49267 is fixed 
Add the test to disabled list and remove from the experimental list.
 2009-12-02 15:17:49 +05:30
Georgi Kodinov
0b7c514e1e merged 2009-12-01 11:24:42 +02:00
Georgi Kodinov
a33168168c Bug #45576: moving the test from experimental to disabled. 2009-12-01 11:21:15 +02:00
c92bce9040 Updated experimental test list for rpl.rpl_cross_version 
and rpl.rpl_get_master_version_and_clock.
 2009-12-01 16:27:21 +08:00
Alexander Nozdrin
9c61ec687f Manual merge from mysql-trunk-merge. 2009-11-06 18:19:24 +03:00
Alexander Nozdrin
2ca5b2c791 Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
Sergey Vojtovich
21fad4ee1f Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. 2009-11-05 16:29:58 +04:00
Alexander Nozdrin
5ae8ae3a8e Manual merge from mysql-5.1. 2009-11-05 12:20:41 +03:00
Alexander Nozdrin
ca1d413360 Automerge from mysql-trunk-bugfixing. 2009-10-27 13:05:40 +03:00
Alexander Nozdrin
436223fbe3 Make rpl_timezone experimental due to Bug#47017. 2009-10-27 13:05:06 +03:00
Georgi Kodinov
0ce16dbf6d rpl_cross_version made experimental because of bug #43913 2009-10-26 14:33:03 +02:00
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
Bjorn Munch
6c9cb9ba22 merge from 5.1 main 2009-10-16 23:25:05 +02: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