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

58919 commits

This branch
This branch
All branches
Author SHA1 Message Date
He Zhenxing
6c3c984fc4 disable rpl_spec_variables due to it fails constantly on HPUX 2009-10-27 16:42:50 +08:00
Luis Soares
7d970f8285 automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge. 2009-10-25 22:58:52 +00: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
He Zhenxing
ce912c8ccf Auto merge 5.1-rep-semisync to 5.1-rep+2-delivery1 2009-10-23 21:34:07 +08:00
He Zhenxing
a02972d820 Skip semisync test if the plugin-dir is not set to semisync plugin dir 2009-10-23 21:26:17 +08:00
Luis Soares
75aa76072f Added rpl_heartbeat_2slaves to experimental list. 2009-10-23 10:33:12 +01:00
Luis Soares
178cdeaa79 post-push fix: Preserving warning codes from mysql-next-mr. Updated 
result files.

Warnings affected:
 - WARN_NON_ASCII_SEPARATOR_NOT_IMPLEMENTED
 - ER_TOO_LONG_FIELD_COMMENT
 2009-10-23 10:29:59 +01:00
He Zhenxing
0e93befd36 Postfix of previews commit, add missing file 
plugin/semisync/CMakeLists.txt:
  Add CMakeLists.txt for semisync
 2009-10-23 15:22:20 +08:00
He Zhenxing
e9acb9f021 Add semi-sync support for Windows 
CMakeLists.txt:
  Add plugin/semisync subdirectory
mysql-test/mysql-test-run.pl:
  Check for semisync dll for Windows
mysql-test/suite/rpl/r/rpl_semi_sync.result:
  Update result file
mysql-test/suite/rpl/t/rpl_semi_sync.test:
  Test semi-sync on Windows
plugin/semisync/semisync_master.cc:
  Define gettimeofday for Windows
 2009-10-23 12:56:30 +08: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
75116feb4b Merge from mysql-trunk. 2009-10-23 00:14:05 +04:00
Alexander Nozdrin
2fc2acd7f5 Fix default.conf. 2009-10-23 00:13:18 +04:00
Bjorn Munch
c01fcec8f8 null upmerge from trunk-mtr 2009-10-22 09:40:16 +02:00
Bjorn Munch
e26a2f3b61 new merge from next-mr 2009-10-22 09:36:39 +02:00
Bjorn Munch
d5bfcd6abe null merge from 5.1 2009-10-22 09:28:39 +02:00
Bjorn Munch
3a2434d432 new merge from trunk 2009-10-22 09:13:44 +02: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
ff98b6a2c2 Update errmsg-utf8.txt after automerge. 2009-10-21 17:25:10 +04:00
Alexander Barkov
dcb8bb23c2 Merging mysql-next-mr-merge to mysql-next-mr. 2009-10-21 15:48:22 +05:00
Bjorn Munch
0632e9a407 merge from next-mr 2009-10-21 12:18:33 +02: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
e30e0325a2 Merge from mysql-trunk-merge. 2009-10-21 00:24:42 +04:00
Satya B
78dde957e9 Fix the windows Build failure due to the changes to CMakelists by r2910. 
Remove the extra line which try to use the name INNOBASE again. The IF ELSE
loop above declares the library name based on the version of mysql
 2009-10-20 16:11:50 +05:30
Bjorn Munch
78b2ca30c6 merge 48149 2009-10-20 12:06:33 +02:00
Bjorn Munch
0777ef567d merge 48149 2009-10-20 12:05:28 +02:00
Bjorn Munch
4113d6ca88 merge 48149 2009-10-20 12:04:55 +02:00
Alexander Nozdrin
5c4cb505ef Merge from mysql-trunk-merge. 2009-10-20 13:46:43 +04:00
Satya B
221c7df75c Merge a CMakeLists.txt change from Innodb plugin 1.0.5 2009-10-20 15:12:38 +05:30
Alexander Nozdrin
82bb84e1aa A fix for innodb_bug44369.test due to Bug#47233 (Innodb calls 
push_warning(MYSQL_ERROR::WARN_LEVEL_ERROR)).

The Signal/Resignal patch changes the push_warning() API: now
it silently downgrades WARN_LEVEL_ERROR to WARN_LEVEL_WARN.

This patch should be rolled back when Bug#47233 is fixed.
 2009-10-20 13:37:07 +04:00
Alexander Nozdrin
2c3d501189 Automerge from mysql-trunk-merge. 2009-10-19 22:41:18 +04:00
Alexander Nozdrin
a1ac1b7d48 Automerge from mysql-trunk. 2009-10-19 22:40:08 +04:00
Bjorn Munch
e6bc01d170 Bug #48149 MTR should automatically skip SSL tests if SSL not supported 
Knowledge of no SSL support is not used
Skip tests the same way e.g. innodb tests are
Does not refer to have_ssl_communication.inc, 
     will add this when merging to 6.0-codebase
 2009-10-19 15:51:47 +02:00
Alexander Nozdrin
bd60794fd8 Merge from mysql-trunk-merge. 2009-10-19 17:36:19 +04:00
Bjorn Munch
2f36bc160a merge 48130 and 48133 2009-10-19 15:33:34 +02:00
Alexander Nozdrin
03bf73de2f Merge from mysql-5.1. 2009-10-19 17:28:31 +04:00
Alexander Nozdrin
b76ccb1276 Merge from mysql-5.1. 2009-10-19 17:19:37 +04:00
Alexander Nozdrin
3251065aef Merge from mysql-5.1. 2009-10-19 17:17:08 +04:00
Bjorn Munch
6203b7b367 merge 48130 and 48133 from 5.1 2009-10-19 15:14:26 +02:00
Bjorn Munch
599b745bc1 merge 48130 and 48133 from 5.1 2009-10-19 15:12:16 +02:00
Alexander Nozdrin
9b4b453ab8 Null-merge up to revno:3163 from mysql-5.1 (InnoDB changes). 2009-10-19 17:10:22 +04:00
He Zhenxing
d8dee8cb32 Postfix of bug#45674 
rpl_semi_sync_master_wait_sessions was reset by FLUSH STATUS,
which could cause the master fail to wake up waiting sessions and
result in master timeout waiting for slave reply.

rpl_semi_sync_master_wait_session should not be reset, this 
problem is fixed by this patch.


plugin/semisync/semisync_master_plugin.cc:
  Change wait_sessions from SHOW_LONG back to SHOW_FUNC so that it will not be reset by FLUSH STATUS.
 2009-10-18 20:29:03 +08:00
Bjorn Munch
c6533f9eb3 Bug #48133 MTR should not dump entire history of mysqld log when failing to start server 
Don't print entire log, but use extract_server_log() introduced by 46007
 2009-10-18 13:01:46 +02:00
Bjorn Munch
cf7afa1164 merge from next-mr 2009-10-18 10:08:07 +02:00
Bjorn Munch
bc1f79fb3e merge from trunk 2009-10-18 09:54:50 +02:00
Bjorn Munch
dcf6aae407 Bug #48130 Expected failures should not count towards max-test-fail 
Test batches may be terminated too early
Avoid counting exp-fail tests
 2009-10-17 18:34:56 +02:00
Bjorn Munch
72c96cbd0e merge from 5.1 main 2009-10-16 23:25:05 +02:00