Andrei Elkin
69d6fcbd3b
merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640
2009-11-06 18:35:04 +02:00
Bjorn Munch
a96205adc8
merge 47663 and 48209
2009-11-04 15:00:03 +01:00
Bjorn Munch
6478fcb93d
merge 47663 and 48209
2009-11-04 14:57:16 +01:00
Bjorn Munch
ea91cac7eb
merge 48209
2009-11-04 14:44:19 +01:00
Luis Soares
6e068a9cf8
BUG#48048: Deprecated constructs need removal in Betony
...
NOTE: Backport of:
bzr log -r revid:sp1r-serg@sergbook.mysql.com-20070505200319-38337
------------------------------------------------------------
revno: 2469.263.4
committer: serg@sergbook.mysql.com
timestamp: Sat 2007-05-05 13:03:19 -0700
message:
Removing deprecated features:
--master-XXX command-line options
log_bin_trust_routine_creators
table_type
BACKUP TABLE ...
RESTORE TABLE ...
SHOW PLUGIN
LOAD TABLE ... FROM MASTER
LOAD DATA FROM MASTER
SHOW INNODB STATUS
SHOW MUTEX STATUS
SHOW TABLE TYPES
... TIMESTAMP(N)
... TYPE=engine
RESET SLAVE don't reset connection parameters anymore
LOAD DATA: check opt_secure_file_priv before access(filename)
improved WARN_DEPRECATED macro
2009-11-04 12:28:20 +00:00
Bjorn Munch
ef6257042a
upmerge 48240
2009-10-26 15:30:49 +01:00
Bjorn Munch
91a7be405c
upmerge 48240
2009-10-26 15:29:38 +01:00
Bjorn Munch
6c28505e6e
Bug #48240 "Test suite timeout" and "Too many tests failed" is masked from status page
...
Prepend "Completed", "Timeout" or "Too many failed" to summary line
2009-10-26 14:28:51 +01:00
Luis Soares
78172f9e21
automerge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge.
2009-10-25 22:58:52 +00:00
Bjorn Munch
fe76fb69a0
Bug #48209 Confusing message "Test has succeeded" after test fails due to warnings
...
There's no need for --verbose for the mysqltest in check-warnings, remove it
2009-10-23 13:04:55 +02:00
He Zhenxing
b6529a140b
Add semi-sync support for Windows
2009-10-23 12:56:30 +08: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
Bjorn Munch
23e557d48a
new merge from next-mr
2009-10-22 09:36:39 +02:00
Bjorn Munch
6756d64b81
new merge from trunk
2009-10-22 09:13:44 +02: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
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
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
Bjorn Munch
a47a167492
merge 48130 and 48133
2009-10-19 15:33:34 +02: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
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
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
Bjorn Munch
b21c62bedd
merge 46007 from 5.1
2009-10-16 11:02:37 +02:00
Sergey Glukhov
7741d9b50d
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
Alexander Nozdrin
ca08f10ccd
Manual merge from mysql-trunk-merge.
2009-10-14 12:25:39 +04:00
Bjorn Munch
23306c563a
Bug #46007 Tests fail due to a crash while running 'check testcase before test'
...
Difficult to debug due to lacking report
This does not solve the real issue, but extracts server log when it happens
Forst commit was incomplete, didn't cover all cases
2009-10-14 09:31:34 +02:00
Alexander Nozdrin
0f51423532
Merge from mysql-5.1.
2009-10-13 13:42:38 +04:00
Bjorn Munch
de54fa30a6
avoid regexp warning after 46625
2009-10-09 15:18:43 +02:00
Bjorn Munch
1cfe27ba58
avoid regexp warning after 46625
2009-10-09 15:16:36 +02:00
Bjorn Munch
e2e8115528
Remove obsolete comments after fixing 42408
2009-10-08 14:32:45 +02:00
Bjorn Munch
ebd84796fe
Remove obsolete comments after fixing 42408
2009-10-08 14:31:39 +02:00
Bjorn Munch
79a1ba30e1
merge from mtr-51
2009-10-08 11:34:42 +02:00
Bjorn Munch
57d40c6ba4
Bug #47716 mtr2 prints obscure error when started with -gdb and xterm is missing
...
Tried to use an expression inside ""
Go via variable, and add $exe to the output
2009-10-08 11:23:04 +02:00
Bjorn Munch
00709918e4
Bug #46625 Pushbuild2: does not notice test failure in "Innodb Plugin" mode
...
Disallow (and don't use) space in combination names
2009-10-08 11:14:42 +02:00
Magnus Blåudd
700f21b7a0
Bug#47801 The plugin test fails with the Embedded Server on Windows
...
- Remove the "hack" from mtr.pl that skipped searching for the .dll files
when embedded and windows. Now the variables will be preoperly initialized.
- Make the tests detect that they can't run on windows+embedded
2009-10-08 10:39:15 +02:00
Magnus Blåudd
d94752f42b
Merge
2009-10-08 10:32:43 +02:00
Magnus Blåudd
04e99c1009
Bug#42589 mysql_fix_privilege_tables.sh to be deprecated
...
- Remove remnants of "mysql_fix_privilege_tables.sh"(again)
2009-10-07 15:42:16 +02:00
Alexander Nozdrin
ca8706ff0f
Backport WL#4085: Merge revno:2476.657.219 from 6.0.
2009-10-06 14:47:04 +04:00
Bjorn Munch
a3f4fcc5ae
merge 46327 and 47811 from 5.1-mtr
2009-10-06 10:58:29 +02:00
Bjorn Munch
0311f538b0
Bug #47811 ./mysql-test-run.pl --valgrind uses old (too narrow) allignment
...
Remove the alignment option, let valgrind use its default
2009-10-06 10:42:05 +02:00
Bjorn Munch
a0ed9a389d
Bug #46327 MTR2 prevents gcov data accumulation
...
mysqladmin fails on Linux in 6.0 without --character-sets-dir
Also added timeout for server shutdown, hope this will solve it
2009-10-06 10:35:35 +02:00
Bjorn Munch
aef601d4e3
merge 47243 from 5.1
2009-10-05 13:12:04 +02:00
Bjorn Munch
bd3e299482
Bug #47243 Allow MTR to read max auto setting for --parallel from env. variable
...
In stead of hard-coded 8, read from $MTR_MAX_PARALLEL if set
2009-10-05 13:08:10 +02:00
Ingo Struewing
c2e1614814
auto-merge
2009-10-02 13:27:48 +02:00
He Zhenxing
04c6e8ff07
Post fix SEMISYNC_PLUGIN_OPT when semi-sync plugins are not found
2009-10-02 19:16:06 +08:00
