Luis Soares
9ef305232f
Added rpl_heartbeat_2slaves to experimental list.
2009-10-23 10:33:12 +01:00
Luis Soares
aa12c04656
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
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
2f5413ebc5
Merge from mysql-trunk.
2009-10-23 00:14:05 +04:00
Alexander Nozdrin
4b8eb9891c
Fix default.conf.
2009-10-23 00:13:18 +04:00
Bjorn Munch
2f0c4678e5
null upmerge from trunk-mtr
2009-10-22 09:40:16 +02:00
Bjorn Munch
23e557d48a
new merge from next-mr
2009-10-22 09:36:39 +02:00
Bjorn Munch
8aee8bd2c7
null merge from 5.1
2009-10-22 09:28:39 +02:00
Bjorn Munch
6756d64b81
new merge from trunk
2009-10-22 09:13:44 +02: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
1ea4a9f371
Update errmsg-utf8.txt after automerge.
2009-10-21 17:25:10 +04:00
Alexander Barkov
344ddc85fa
Merging mysql-next-mr-merge to mysql-next-mr.
2009-10-21 15:48:22 +05:00
Bjorn Munch
b738a5e57e
merge from next-mr
2009-10-21 12:18:33 +02: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
d950f6568b
Merge from mysql-trunk-merge.
2009-10-21 00:24:42 +04:00
Satya B
0ddb2ca740
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
d25a26268c
merge 48149
2009-10-20 12:06:33 +02:00
Bjorn Munch
684b1d39ac
merge 48149
2009-10-20 12:05:28 +02:00
Bjorn Munch
e00d636494
merge 48149
2009-10-20 12:04:55 +02:00
Alexander Nozdrin
5f255b44e3
Merge from mysql-trunk-merge.
2009-10-20 13:46:43 +04:00
Satya B
bca54639b6
Merge a CMakeLists.txt change from Innodb plugin 1.0.5
2009-10-20 15:12:38 +05:30
Alexander Nozdrin
356efddad6
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
583d724e64
Automerge from mysql-trunk-merge.
2009-10-19 22:41:18 +04:00
Alexander Nozdrin
01a9db0621
Automerge from mysql-trunk.
2009-10-19 22:40:08 +04:00
Bjorn Munch
23ef842e03
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
3fd2f50b6c
Merge from mysql-trunk-merge.
2009-10-19 17:36:19 +04:00
Bjorn Munch
a47a167492
merge 48130 and 48133
2009-10-19 15:33:34 +02:00
Alexander Nozdrin
b930b18ec3
Merge from mysql-5.1.
2009-10-19 17:28:31 +04:00
Alexander Nozdrin
4ed388a5b4
Merge from mysql-5.1.
2009-10-19 17:19:37 +04:00
Alexander Nozdrin
f3457a73d6
Merge from mysql-5.1.
2009-10-19 17:17:08 +04:00
Bjorn Munch
542ffe5e87
merge 48130 and 48133 from 5.1
2009-10-19 15:14:26 +02:00
Bjorn Munch
3e43817fca
merge 48130 and 48133 from 5.1
2009-10-19 15:12:16 +02:00
Alexander Nozdrin
af9de4ff6b
Null-merge up to revno:3163 from mysql-5.1 (InnoDB changes).
2009-10-19 17:10:22 +04:00
Bjorn Munch
6c68019899
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
423dacf3c6
merge from next-mr
2009-10-18 10:08:07 +02:00
Bjorn Munch
2bbe4cc882
merge from trunk
2009-10-18 09:54:50 +02:00
Bjorn Munch
264c330fd0
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
6c9cb9ba22
merge from 5.1 main
2009-10-16 23:25:05 +02:00
Timothy Smith
813d8ff6dc
Merge from mysql-5.4.3-beta-release
2009-10-16 20:19:36 +02:00
Timothy Smith
6d569306b4
Update _libdir/plugin to _libdir/mysql/plugin in a few places
2009-10-16 19:59:23 +02:00
Timothy Smith
e1c54dd9ad
Work around a problem in IBM compiler (on aix / i5os) that doesn't
...
use function prototypes from header in conjunction with K&R-style
function definitions. The symptom is a type mismatch between
int and wchar_t.
2009-10-16 19:53:10 +02:00
Joerg Bruehe
ee56b111a0
Upmerge merge changesets.
2009-10-16 16:12:42 +02:00
Joerg Bruehe
9cabf98cb0
Merge a compile fix.
2009-10-16 15:35:39 +02:00
Joerg Bruehe
5c95f2363a
Upmerge the Windows compile fix from 5.0 to 5.1
2009-10-16 15:05:52 +02:00
Joerg Bruehe
f359b258ee
Merge 5.0-bugteam (compile fix) into main 5.0
2009-10-16 14:29:41 +02:00
Joerg Bruehe
11d4eb352d
Merge the Windows compile fix into the push tree.
2009-10-16 14:09:31 +02:00
