Commit graph

58469 commits

Author SHA1 Message Date
Bjorn Munch
5447969d43 Remove obsolete comments after fixing 42408 2009-10-08 14:34:24 +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
2477b72b5a merge from trunk-mtr 2009-10-08 11:37:55 +02:00
Bjorn Munch
79a1ba30e1 merge from mtr-51 2009-10-08 11:34:42 +02:00
Bjorn Munch
9a3d3f4724 Bug #47218 mysqltest ignores "error" command inside if inside loop
This was affected by same problem as append_file etc.
Added Q_ERROR to special handling, and added small test
2009-10-08 11:30:03 +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
Vladislav Vaintroub
d003ddfdab merge 2009-10-07 16:34:45 +02:00
Magnus Blåudd
8ccd9d7cbe BUG#47612 - fix review comment 2009-10-07 16:25:36 +02:00
Bjorn Munch
957648b313 merge 46327 and 47811 from 5.1-mtr->trunk-mtr 2009-10-06 11:00:13 +02: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
63a615ef0a merge 47243 from 5.1 via trunk 2009-10-05 13:13:56 +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
Bjorn Munch
d7ed74a36b null merge of 47383 from 5.1, does not apply 2009-10-05 10:59:59 +02:00
Bjorn Munch
a47857cb58 null merge of 47383 from 5.1, does not apply 2009-10-05 10:56:00 +02:00
Bjorn Munch
e46fe1ca21 Bug #47383 let mysql-test-run.pl run innodb tests using the plugin
Alt. solution: let the "InnoDB plugin" combinations apply
Added some alternative plugin paths (I need to move the code anyway)
2009-10-02 10:36:38 +02:00
Vladislav Vaintroub
5f80994f4e Bug #47731 mtr freezes for many seconds when process to be killed has already gone.
The problem is that safe_kill_win fails to detect a dead process. OpenProcess() will 
succeed even after the process died, it will first fail after the last handle to process 
is closed.

To fix the problem, check process status with GetExitCodeProcess() and consider 
process to be dead if the exit code returned by this routine is not STILL_ALIVE.
2009-09-30 00:19:00 +02:00
Magnus Blåudd
621e98a31b Bug#47612 mtr - improving the report for valgrind erorrs
- Improve the report produced when a valgrind error is detected
2009-09-24 16:09:11 +02:00
Bjorn Munch
7e6392a463 null merge from trunk-mtr 2009-09-23 13:52:21 +02:00
Bjorn Munch
597850888b null merge from 5.1-mtr 2009-09-23 13:39:36 +02:00
Bjorn Munch
3e14f87e70 merge from -trunk 2009-09-23 13:34:24 +02:00
Alexander Nozdrin
8dd75c98ed Update default.conf. 2009-09-23 14:12:43 +04:00
Alexander Nozdrin
9b9f814d63 Merge from mysql-next-mr. 2009-09-23 14:11:41 +04:00
Alexander Nozdrin
1bb4ba29be Merge from mysql-trunk. 2009-09-23 14:10:04 +04:00
Alexander Nozdrin
04fff1e8fe Update default.conf. 2009-09-23 14:08:38 +04:00
Alexander Nozdrin
e4ebc5c6d9 Update default.conf. 2009-09-23 14:04:08 +04:00
Alexander Nozdrin
928de7ede6 Merge from mysql-trunk. 2009-09-23 13:59:23 +04:00
Alexander Nozdrin
abf845b9d4 Merge from mysql-trunk-alik. 2009-09-23 13:51:45 +04:00
Alexander Nozdrin
72feecb4f0 Update version in configure.in. 2009-09-23 13:50:31 +04:00
Bjorn Munch
e03d7d4c34 merge from 5.1 main 2009-09-23 10:21:16 +02:00
Alexander Nozdrin
665fda8b55 Merge from mysql-trunk(-alik). 2009-09-23 11:17:49 +04:00
Alexander Nozdrin
22ceefcb58 Merge from mysql-5.1. 2009-09-23 11:16:11 +04:00
Bjorn Munch
c82ce4629c merge 5.1-mtr -> 5.1 -> trunk 2009-09-23 00:49:34 +02:00
Bjorn Munch
726df480f9 merge from 5.1 of merge from 5.1-mtr 2009-09-22 23:41:37 +02:00
Alexander Nozdrin
46a04938eb Merge from mysql-next-mr. 2009-09-22 18:26:17 +04:00
Alexander Nozdrin
8878213408 Merge from mysql-trunk. 2009-09-22 18:24:53 +04:00
Alexander Nozdrin
d6022269a6 Merge from mysql-trunk. 2009-09-22 18:23:12 +04:00
Alexander Nozdrin
140d81e96d Update version. 2009-09-22 18:21:44 +04:00
Bjorn Munch
edea810223 merge from trunk (with trunk-mtr) 2009-09-22 14:39:18 +02:00
Bjorn Munch
8e59a23d7d merge from trunk-mtr 2009-09-22 12:52:31 +02:00
Jonathan Perkin
54cc3ecd0e Merge from mysql-5.1.39-release 2009-09-21 12:10:32 +02:00
Bjorn Munch
59b1991bc0 new merge from trunk 2009-09-21 11:43:01 +02:00
Bjorn Munch
52dc273d79 tiny suppression fix: avoid / 2009-09-21 11:28:49 +02:00
Alexander Nozdrin
1ff8e28a3e Update default.experimental. 2009-09-20 01:09:02 +04:00