database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-10-16 22:27:52 +03:00
Code Activity
71,891 Commits 3,235 Branches 1,092 Tags
2a2641ad7fa5db38cd2619014dbcb15f16b51ea8
Commit Graph

177 Commits

Author SHA1 Message Date
Vladislav Vaintroub
b87ed568b4 merge, CMake bugfixes, remove sp-error from experimental 2010-02-23 13:50:45 +01:00
Alexander Nozdrin
0ceeeafe85 Manual merge from mysql-next-mr. 
Conflicts:
  - mysql-test/r/mysqld--help-notwin.result
  - mysql-test/r/mysqld--help-win.result
 2010-02-22 16:22:31 +03:00
Alexander Nozdrin
9d626aa5ff Make sp-error.test experimental on Windows due to Bug 43201. 
The patch is ready and will be pushed via -bugfixing.
 2010-02-22 14:40:41 +03:00
Magne Mahre
de554de667 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
Magne Mahre
1191483b9c Merge from mysql-trunk-bugfixing 2010-02-17 22:19:56 +01:00
Luis Soares
c4f1de9f11 Automerge from mysql-next-mr-bugfixing. 2010-02-11 13:50:18 +00:00
Luis Soares
87c0c9cfe8 Automerge from mysql-next-mr. 2010-02-09 10:46:18 +00:00
Marc Alff
d935204240 Merge mysql-next-mr-marc --> mysql-next-mr-bugfixing 2010-02-05 09:56:55 -07:00
Marc Alff
ae7615c091 Merge mysql-next-mr (revno 2996) --> mysql-next-mr-marc 2010-02-05 08:10:20 -07:00
Alexander Nozdrin
a45ea00b32 Manual merge from mysql-next-mr. 
Conflicts:
  - sql/sys_vars.cc
 2010-02-05 15:05:37 +03:00
Alexander Nozdrin
daec25c11d Mark some tests experimental. 2010-01-31 14:38:55 +03:00
Alexander Nozdrin
077e7c9a87 Manual merge from mysql-trunk-merge. 
Conflicts:
  - mysql-test/collections/default.experimental
  - mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result
  - mysql-test/suite/rpl/t/rpl_get_master_version_and_clock.test
 2010-01-31 00:26:38 +03:00
Alexander Nozdrin
2b8f00a9c0 Manual merge from mysql-trunk-merge. 2010-01-30 22:41:52 +03:00
Alexander Nozdrin
0da16c7c2a 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
2423a7b68f 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
Marc Alff
4a7a3371c5 Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marc 2010-01-27 09:34:13 -07:00
unknown
c12c9780cd 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.


mysql-test/suite/rpl/r/rpl_get_master_version_and_clock.result:
  Removed mtr.add_suppression("Get master clock failed with error: ")
  and mtr.add_suppression("Get master SERVER_ID failed with error: ").
  Because they are suppressed globally.
 2010-01-27 10:52:13 +08:00
Luis Soares
1b6391e930 Removed test cases from experimental list: 
- rpl.rpl_slave_load_remove_tmpfile
  - rpl.rpl_sync
 2010-01-26 10:11:16 +00:00
Alexander Nozdrin
8baba07f6a Make sys_vars.delayed_insert_limit_func experimental due to Bug 50435. 2010-01-25 19:04:56 +03:00
Marc Alff
63ea7489a0 Removing perfschema.tampered_perfschema_table1 from the experimental tests 2010-01-22 18:06:13 -07:00
Alexander Nozdrin
da32064baf Mark several failing test cases experimental. 2010-01-20 18:25:29 +03:00
Georgi Kodinov
6e72f4171f merge 5.1-main to 5.1-bugteam 2010-01-13 12:28:42 +02:00
Georgi Kodinov
9b75c2f268 Made outfile_testdata experimental in 5.1-bugteam, pending the 
resulution of bug #46895.
 2010-02-01 14:05:21 +02:00
Alexander Nozdrin
c736665e43 Disable plugin_load.test due to Bug#42144. 2009-12-21 13:20:43 +03:00
Satya B
8f0f1d0ddb Removing rpl.rpl_trigger from experimental list as it is Fixed by BUG#46656 2009-12-22 18:33:39 +05:30
Alexey Kopytov
ebdef570e5 Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. 2009-12-11 19:40:58 +03:00
Alexander Nozdrin
5676713687 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
7948403b05 Automerge bzr bundle from bug report. 
Removed rpl_cross_version from experimental list.
 2009-12-06 23:36:07 +00:00
Alexey Kopytov
8b7ae8c67d 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
8317ffce10 Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. 2009-12-03 23:46:06 +03:00
Satya B
d24b879474 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
0dde5599bd merged 2009-12-01 11:24:42 +02:00
Georgi Kodinov
f1eb8d937e Bug #45576: moving the test from experimental to disabled. 2009-12-01 11:21:15 +02:00
unknown
f5b7184919 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
ea0bbb7248 Manual merge from mysql-trunk-merge. 2009-11-06 18:19:24 +03:00
Alexander Nozdrin
7cd11f45be Manual merge from mysql-trunk-merge. 2009-11-06 17:20:27 +03:00
Sergey Vojtovich
ced8719400 Merge of innodb-zip-ss6129 from 5.1 to mysql-trunk. 2009-11-05 16:29:58 +04:00
Alexander Nozdrin
c063bd171e Manual merge from mysql-5.1. 2009-11-05 12:20:41 +03:00
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
Georgi Kodinov
fb043f9bc2 rpl_cross_version made experimental because of bug #43913 2009-10-26 14:33:03 +02: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
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
265eee595b Mark rpl.rpl_innodb_bug28430 experimental unconditionally. 2009-10-21 00:26:56 +04:00
Alexander Nozdrin
03bf73de2f Merge from mysql-5.1. 2009-10-19 17:28:31 +04:00
Bjorn Munch
72c96cbd0e merge from 5.1 main 2009-10-16 23:25:05 +02:00
Georgi Kodinov
d6573fea19 All NDB tests made experimental after a discussion with Bernhard Ocklin. 2009-10-15 14:22:25 +03:00