Bjorn Munch
22d80703ef
Bug #49096 mtr: --mem option should be ignored on Windows
...
Ignored w/message in v1 and v2
2009-11-26 11:23:30 +01:00
Bjorn Munch
4deb53a56d
Bug #49096 mtr: --mem option should be ignored on Windows
...
Ignored w/message in v1 and v2
2009-11-26 11:23:30 +01:00
unknown
f92723ebc2
After-merge fixes for merge of MySQL 5.1.41 into MariaDB: more post-shutdown warning fixes.
2009-11-26 09:02:33 +01:00
unknown
e8263422a7
After-merge fix for MySQL 5.1.41 merge into MariaDB: Another warning antipattern also needed during shutdown.
2009-11-26 08:45:54 +01:00
unknown
3cc208730a
After-merge fix for merge of MySQL 5.1.41 into MariaDB: Valgrind fixes.
...
mysql-test/mysql-test-run.pl:
Fix Valgrind warnings: add more post-shutdown warning suppressions, and revert
bad previous change.
sql/log_event.cc:
Manually apply fix for Bug#48340 (basically missing initialisation
of thd->lex->local_file in Load_log_event::do_apply_event())
2009-11-25 12:06:01 +01:00
Vladislav Vaintroub
39a158221d
add --disable-shared equivalent
...
fix mtr (empty argument passed to mysqld)
2009-11-25 05:13:51 +01:00
Vladislav Vaintroub
2f3e777797
add --disable-shared equivalent
...
fix mtr (empty argument passed to mysqld)
2009-11-25 05:13:51 +01:00
Bjorn Munch
055728420f
merge 47978,48683
2009-11-24 12:27:19 +01:00
Bjorn Munch
e536016cbe
merge 47978,48683
2009-11-24 12:27:19 +01:00
Bjorn Munch
b84649d8b3
merge 47978,48683
2009-11-24 12:26:06 +01:00
Bjorn Munch
66d661d4dd
merge 47978,48683
2009-11-24 12:26:06 +01:00
unknown
fc2f3176ea
After-merge fix for MySQL 5.1.41 merge: suppress some warnings during shutdown.
...
The MySQL 5.1.41 merge adds back some more warning lines in error log to be
checked. So some suppressions for these new ones need to be added to the code
in MariaDB that checks for warnings during server shutdown (MySQL only checks
for warnings that occur while executing the test cases themselves).
2009-11-24 10:34:42 +01:00
Bjorn Munch
e1fbb32e76
Bug #47978 timer : expired after 90 seconds
...
Problems occur after killing threads on Windows
Get rid of the timeout threads, implement simple timer in wait_any_timeout()
2009-11-24 09:12:48 +01:00
Bjorn Munch
8e04f4c73c
Bug #47978 timer : expired after 90 seconds
...
Problems occur after killing threads on Windows
Get rid of the timeout threads, implement simple timer in wait_any_timeout()
2009-11-24 09:12:48 +01:00
unknown
e520330655
After-merge fixes for MySQL 5.1.41 merge into MariaDB.
...
Makefile.am:
Fix incorrect automerges.
mysql-test/mysql-test-run.pl:
Fix bad merge.
We revert some of the MySQL-side changes, as the problem is that they may accidentally ignore some warnings in mysqld.err that should be reported.
Also remove some differences between MySQL and MariaDB where there is no semantic difference (to make future merges easier).
2009-11-23 15:04:17 +01:00
Bjorn Munch
557afc9057
upmerge 35543,48367,48671,48806,48808
2009-11-19 10:25:57 +01:00
Bjorn Munch
679f097010
upmerge 35543,48367,48671,48806,48808
2009-11-19 10:25:57 +01:00
Bjorn Munch
fc772d0d48
upmerge 35543,48367,48671,48806,48808
2009-11-19 10:24:24 +01:00
Bjorn Munch
0adf3db01f
upmerge 35543,48367,48671,48806,48808
2009-11-19 10:24:24 +01:00
Bjorn Munch
a9fd7242b5
merge 48808
2009-11-19 10:19:18 +01:00
Bjorn Munch
db1b1160dd
merge 48808
2009-11-19 10:19:18 +01:00
Bjorn Munch
f84625778c
merge 48806
2009-11-19 10:17:56 +01:00
Bjorn Munch
964a6ebaac
merge 48806
2009-11-19 10:17:56 +01:00
Bjorn Munch
d97cc562fc
merge 35543
2009-11-19 10:14:25 +01:00
Bjorn Munch
1cc0f036d6
merge 35543
2009-11-19 10:14:25 +01:00
Bjorn Munch
ea4618e1d1
Bug #35543 mysqlbinlog.cc does not properly work with tmp files
...
mtr patch ported to v2
2009-11-19 10:10:21 +01:00
Bjorn Munch
91bb19f44e
Bug #35543 mysqlbinlog.cc does not properly work with tmp files
...
mtr patch ported to v2
2009-11-19 10:10:21 +01:00
Bjorn Munch
9ea158edf0
Bug #48367 MTR should react to server dying, rather than to resulting failure of mysqltest
...
For some reason it usually picks up mysqltest
Wait .1s and then see if a server has died
Change from first commit: label on separate line
2009-11-19 09:58:50 +01:00
Bjorn Munch
9d69adc9d6
Bug #48367 MTR should react to server dying, rather than to resulting failure of mysqltest
...
For some reason it usually picks up mysqltest
Wait .1s and then see if a server has died
Change from first commit: label on separate line
2009-11-19 09:58:50 +01:00
Bjorn Munch
eb2ad909d4
Bug #48808 mysql-test-run.pl --debugger=devenv does not work
...
Wrong argument order, fixed
2009-11-18 10:27:43 +01:00
Bjorn Munch
54bdfab91e
Bug #48808 mysql-test-run.pl --debugger=devenv does not work
...
Wrong argument order, fixed
2009-11-18 10:27:43 +01:00
Bjorn Munch
242f3f8cdd
Bug #48806 mysql-test-run.pl --help should work even in the absence of binaries
...
Searches for my_safe_process binary too early
Put this into a sub() and call it after examining options (incl. --help)
2009-11-17 12:13:22 +01:00
Bjorn Munch
2b0be38266
Bug #48806 mysql-test-run.pl --help should work even in the absence of binaries
...
Searches for my_safe_process binary too early
Put this into a sub() and call it after examining options (incl. --help)
2009-11-17 12:13:22 +01:00
Bjorn Munch
830a2b1bbd
mtr ignoring of skip-im incorrectly removed by backport of WL#4085
2009-11-17 09:36:09 +01:00
Bjorn Munch
7516158138
mtr ignoring of skip-im incorrectly removed by backport of WL#4085
2009-11-17 09:36:09 +01:00
unknown
a962160eec
Merge with MySQL 5.1, with following additions:
...
- Moved some code from innodb_plugin to xtradb, to ensure that all tests runs
- Did changes in pbxt and maria storage engines becasue of changes in thd->query
- Reverted wrong code in sql_table.cc for how ROW_FORMAT is used.
This is a re-commit of Monty's merge to eliminate an extra commit from
MySQL-5.1.42 that was accidentally included in the merge.
This is a merge of the MySQL 5.1.41 clone-off (clone-5.1.41-build). In
case there are any extra changes done before final MySQL 5.1.41
release, these will need to be merged later before MariaDB 5.1.41
release.
2009-11-16 21:49:51 +01:00
Bjorn Munch
1e452eebad
merge 48795
2009-11-16 15:33:08 +01:00
Bjorn Munch
af6a53abd4
merge 48795
2009-11-16 15:33:08 +01:00
Bjorn Munch
b3d0174821
merge 48795
2009-11-16 15:30:25 +01:00
Bjorn Munch
9053565e7b
merge 48795
2009-11-16 15:30:25 +01:00
Bjorn Munch
858d260bd3
Bug #48795 Valgrind summary from tests where server has been restarted cause test failure
...
Seen in a few tests after 43418
Add code in extract_warning_lines() to skip this part
2009-11-16 11:18:16 +01:00
Bjorn Munch
6edaebbf57
Bug #48795 Valgrind summary from tests where server has been restarted cause test failure
...
Seen in a few tests after 43418
Add code in extract_warning_lines() to skip this part
2009-11-16 11:18:16 +01:00
Luis Soares
d8ca6b9dd9
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
...
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
2009-11-13 10:17:53 +00:00
Luis Soares
27b1c660e3
manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)
...
CONFLICTS
=========
Text conflict in sql/sql_yacc.yy
1 conflicts encountered.
2009-11-13 10:17:53 +00:00
Bjorn Munch
f083122876
merge 43418
2009-11-12 11:20:24 +01:00
Bjorn Munch
1250b56613
merge 43418
2009-11-12 11:20:24 +01:00
Bjorn Munch
d1daf0740c
merge 43418
2009-11-12 11:14:56 +01:00
Bjorn Munch
c83b3beb40
merge 43418
2009-11-12 11:14:56 +01:00
Bjorn Munch
f1b4be2a21
Bug #43418 MTR2: does not notice a memory leak occuring at shutdown of mysqld w/ --valgrind
...
Checking is done before server is terminated
Adds post processing of server logs if --valgrind
Also had to remove --quiet option to valgrind
2009-11-12 11:04:01 +01:00
Bjorn Munch
59940cdcd2
Bug #43418 MTR2: does not notice a memory leak occuring at shutdown of mysqld w/ --valgrind
...
Checking is done before server is terminated
Adds post processing of server logs if --valgrind
Also had to remove --quiet option to valgrind
2009-11-12 11:04:01 +01:00
