Bjorn Munch
542ffe5e87
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
Bjorn Munch
3e43817fca
merge 48130 and 48133 from 5.1
2009-10-19 15:12:16 +02: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
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
cf7afa1164
merge from next-mr
2009-10-18 10:08:07 +02:00
Bjorn Munch
423dacf3c6
merge from next-mr
2009-10-18 10:08:07 +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
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
72c96cbd0e
merge from 5.1 main
2009-10-16 23:25:05 +02:00
Bjorn Munch
6c9cb9ba22
merge from 5.1 main
2009-10-16 23:25:05 +02:00
Bjorn Munch
06ac55980c
merge 46007 from 5.1
2009-10-16 11:02:37 +02:00
Bjorn Munch
b21c62bedd
merge 46007 from 5.1
2009-10-16 11:02:37 +02:00
Sergey Glukhov
d8c3f2263f
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
Sergey Glukhov
7741d9b50d
WL#751 Error message construction, backport
2009-10-15 17:23:43 +05:00
Alexander Nozdrin
c30d924dd5
Manual merge from mysql-trunk-merge.
2009-10-14 12:25:39 +04:00
Alexander Nozdrin
ca08f10ccd
Manual merge from mysql-trunk-merge.
2009-10-14 12:25:39 +04:00
Michael Widenius
75a949fb41
Automatic merge with 5.1-merge
2009-10-14 11:09:56 +03:00
Bjorn Munch
972e938dac
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
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
Michael Widenius
c13f68fa14
Force restart before maria_showlog_error to get rid of status from previous connections
...
This fixes a race condition in the test system
mysql-test/include/maria_empty_logs.inc:
Added comment
mysql-test/include/wait_for_status_var.inc:
Fixed type in variable name. Add ' around variables for better error message
mysql-test/mysql-test-run.pl:
Remove -skip-falcon (not to be used), add skip-pbxt to bootstrap
mysql-test/suite/maria/t/maria_showlog_error-master.opt:
Force restart before maria_showlog_error to get rid of status from previous connection
2009-10-13 15:47:17 +03:00
Alexander Nozdrin
c69629d269
Merge from mysql-5.1.
2009-10-13 13:42:38 +04:00
Alexander Nozdrin
0f51423532
Merge from mysql-5.1.
2009-10-13 13:42:38 +04:00
Bjorn Munch
bdc4070aab
avoid regexp warning after 46625
2009-10-09 15:18:43 +02:00
Bjorn Munch
de54fa30a6
avoid regexp warning after 46625
2009-10-09 15:18:43 +02:00
Bjorn Munch
052d9bef83
avoid regexp warning after 46625
2009-10-09 15:16:36 +02:00
Bjorn Munch
1cfe27ba58
avoid regexp warning after 46625
2009-10-09 15:16:36 +02:00
Bjorn Munch
891bad34ba
Remove obsolete comments after fixing 42408
2009-10-08 14:32:45 +02:00
Bjorn Munch
e2e8115528
Remove obsolete comments after fixing 42408
2009-10-08 14:32:45 +02:00
Bjorn Munch
79060e12ee
Remove obsolete comments after fixing 42408
2009-10-08 14:31:39 +02:00
Bjorn Munch
ebd84796fe
Remove obsolete comments after fixing 42408
2009-10-08 14:31:39 +02:00
Bjorn Munch
9b61982f4d
merge from mtr-51
2009-10-08 11:34:42 +02:00
Bjorn Munch
79a1ba30e1
merge from mtr-51
2009-10-08 11:34:42 +02:00
Bjorn Munch
b1b958ffab
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
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
0aca4f0011
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
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
fabde82dbd
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
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
7a633b68d2
Merge
2009-10-08 10:32:43 +02:00
Magnus Blåudd
d94752f42b
Merge
2009-10-08 10:32:43 +02:00
unknown
68602b939b
Fixes for package name change mysql -> mariadb.
...
- Don't need any m1 prefix for the first release based on given MySQL
version number.
- Fix mysql-test-run to understand that some stuff is installed under
share/mariadb rather than share/mysql.
2009-10-08 00:57:43 +02:00
Magnus Blåudd
53653dcef0
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
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
unknown
5c7232af15
Make sure that partition tests are included in mysql-test-run by default.
2009-10-06 16:02:53 +02:00
Alexander Nozdrin
068d170b3c
Backport WL#4085: Merge revno:2476.657.219 from 6.0.
2009-10-06 14:47:04 +04: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
102b25cdb4
merge 46327 and 47811 from 5.1-mtr
2009-10-06 10:58:29 +02:00
Bjorn Munch
a3f4fcc5ae
merge 46327 and 47811 from 5.1-mtr
2009-10-06 10:58:29 +02:00
Bjorn Munch
3141528ea8
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
