Bjorn Munch
588e9930b4
first merge from main
2009-09-02 18:58:17 +02:00
Bjorn Munch
d65168fdda
Bug #32296 mysqltest fails to parse "append_file" inside a "while", it works inside
...
a "if"
Bug #41913 mysqltest cannot source files from if inside while
Some commands require additional processing which only works first time
Keep content for write_file or append_file with the st_command struct
Add tests for those cases to mysqltest.test
2009-09-02 11:17:33 +02:00
Bjorn Munch
5703baad97
merge
2009-09-01 19:31:28 +02:00
Bjorn Munch
202984236a
46996 workaruond
2009-09-01 13:38:17 +02:00
Bjorn Munch
84bd45c849
merge
2009-08-31 15:22:54 +02:00
Bjorn Munch
86a3262d26
forgot : in rpl's disabled.def
2009-08-31 09:24:59 +02:00
Bjorn Munch
2194a927a9
yet another 42408 followup
2009-08-30 12:01:08 +02:00
Bjorn Munch
7941f3c3a0
even more suppression fixes
2009-08-29 23:29:47 +02:00
Bjorn Munch
bc6ea4ced7
A few more suppression fixes after 42408
2009-08-29 10:30:59 +02:00
Bjorn Munch
dbbf8d83ff
Bug #42408 Faulty regex for detecting [Warning] and [ERROR] in mysqld error log
...
Some follow-up test fixes after seeing effect in PB2
2009-08-28 16:13:27 +02:00
Bjorn Munch
013c46cb36
Bug #46973 MTR: extract_warning_lines does not check it's extracting lines for current test
...
Rewrote logic (first commit was incomplete, sorry)
2009-08-28 15:02:48 +02:00
Bjorn Munch
d458d55755
Bug #46322 Sporadic timeout in mysql_upgrade.test
...
Apparently caused by logging to table
Turn on logging to file only, add to .opt file for tests needing log to table
2009-08-27 15:17:09 +02:00
Bjorn Munch
d307fbbf2c
Bug #46164 memory leak in mysqltest after parse error with --debug
...
Moved some dynstr_free() further up
2009-08-27 12:34:07 +02:00
Bjorn Munch
4994e66783
Bug #42408 Faulty regex for detecting [Warning] and [ERROR] in mysqld error log
...
Enabled proper pattern for Warnings and ERRORs
Added some suppressions
2009-08-25 15:56:50 +02:00
Jonathan Perkin
c4fa4f31ae
Apply changes from mysql-5.1.38-release clone:
...
- Add conditionals for bundled zlib and innodb plugin.
- Apply patch from bug#46834 to install the test suite in RPMs.
- Add plugins to RPMs. Disable example plugins.
2009-08-24 10:13:34 +01:00
Joerg Bruehe
7ae2baea09
Upmerge a merge changeset from 5.0 to 5.1, no code change involved.
2009-08-21 11:56:44 +02:00
Joerg Bruehe
56d903a9a3
Merge the correction for the bug#37098 fix into 5.0-build
2009-08-20 22:07:40 +02:00
Joerg Bruehe
6a02c3bce2
automerge the correction for bug#37098 into 5.1-build
2009-08-20 21:58:27 +02:00
Joerg Bruehe
d2d5cdc45e
Merge the correction to the bug#37098 fix from 5.0 to 5.1.
2009-08-20 21:41:12 +02:00
Joerg Bruehe
55f7c2f35f
Get rid of manual pages which aren't used.
...
This is a partial correction to the original fix for bug#37098
Get rid of "Installed (but unpackaged)" files in the RPM build
which used a wrong variable.
2009-08-20 21:08:09 +02:00
Bjorn Munch
3efecb1626
Bug #39003 mtr's diff_files command failed in pushbuild without printing a result diff
...
diff was actually called but result never outputted before exiting
Added extra code to dump output *unless* failure was expected
2009-08-19 13:48:56 +02:00
Bjorn Munch
0211f76d14
Bug #46164 memory leak in mysqltest after parse error with --debug
...
Moved some dynstr_free() further up
2009-08-18 15:26:17 +02:00
Bjorn Munch
bc1b485f90
merge
2009-08-18 09:40:20 +02:00
Bjorn Munch
1a0b63c27a
Bug #44222 mysql-test-run --start analyses which tests it would skip. This is redundant.
...
Quicker test collection and better output with --start[-dirty]
2009-08-18 09:38:18 +02:00
Bjorn Munch
7cdccfa05b
Bug #46755 Wrong grammar in some skip messages: Test need instead of Test needs
...
Fixed in two comments as well
2009-08-17 11:21:02 +02:00
Joerg Bruehe
3a3d5de4d0
Upmerge 5.0-build into 5.1-build
...
This involves merge changesets and backports into QSP builds only,
does not cause a contents change in 5.1
2009-08-13 22:33:00 +02:00
Joerg Bruehe
20efa8d972
Merge main 5.1 into 5.1-build
2009-08-13 22:25:58 +02:00
Bjorn Munch
9407780994
Bug #44979 Enhance MTR --experimental to support platform qualifier
...
Adding @<platform> syntax
2009-08-13 15:29:19 +02:00
Alexander Nozdrin
69d0ddaed6
Ignore auto-generated file: libmysqld/examples/mysqltest.cc
2009-08-12 23:45:01 +04:00
Alexander Nozdrin
14345a2005
Fix 5.1 build error.
2009-08-12 23:43:20 +04:00
Daniel Fischer
cb0df3eed7
Create separate vardirs during collections test runs.
2009-08-12 17:10:15 +02:00
karen.langford@sun.com
21cbee126a
Raise version number after cloning 5.1.38
2009-08-12 16:41:07 +02:00
Sergey Vojtovich
68b96702a0
Disable main.index_merge_innodb with InnoDB plugin. The test case is
...
not ready to run with innoplug-1.0.4.
2009-08-12 17:46:12 +05:00
Bjorn Munch
c32c55eef7
Bug #44012 mtr: test cases that are not supposed to return output always fail
...
Output would match an empty result file but we don't check
Allow empty output IFF there is an empty result file.
2009-08-11 23:41:44 +02:00
Joerg Bruehe
2f87dd3eee
Merge main 5.0 with 5.0-build,
...
automerge didn't handle this correctly,
so test "view" was corrected manually.
2009-08-11 18:59:20 +02:00
Davi Arnaut
cee944fd12
Merge from mysql-5.0-bugteam.
2009-08-11 13:22:28 -03:00
Davi Arnaut
4b80599a62
Fix tree name.
2009-08-11 13:14:27 -03:00
Joerg Bruehe
1f1163455b
Correct a merge error that happened during a backport for 5.0.82sp1:
...
The test for the 45806 entry in our bug DB got applied twice,
in different places for the "view.test" and "view.result" files.
The fix is to simply remove the erroneous insertion.
2009-08-11 18:13:53 +02:00
Davi Arnaut
2c21af95de
Update test case result due to mis-merge.
2009-08-11 13:13:06 -03:00
Vladislav Vaintroub
cea2f8b630
merge fix to define __NT__ on Windows
2009-08-11 17:47:33 +02:00
Vladislav Vaintroub
fcc5126777
Always compile with __NT__ on windows. in 5.1 itthis #define is
...
widely used, in replication (delete_allow_opened) and for named
pipe support. We do not support Win9x anymore.
2009-08-11 17:44:13 +02:00
Davi Arnaut
6fe39a9350
Merge from mysql-5.1-bugteam.
2009-08-11 11:29:07 -03:00
Davi Arnaut
502eb9843e
Update README.
2009-08-11 11:25:40 -03:00
Bjorn Munch
c368771314
Bug #45847 make --gdb disable all the timeouts by default
...
Set to one week for testcase and suite timeout
Also set one day timeout for PID file creation (not currently needed in 5.1 but might become, and is needed in azalea)
2009-08-11 15:59:05 +02:00
Sergey Vojtovich
7a77e3d05a
Merge mysql-5.1-innodb_plugin to mysql-5.1.
2009-08-11 18:05:25 +05:00
Bjorn Munch
687612c8c4
Bug #44479 mysql-test-run does not detect that external server has Innodb support
...
Variable name mismatch
Map variable have_innodb=YES to innodb=ON
2009-08-11 12:59:43 +02:00
sunanda.menon@sun.com
fba963ea93
Raise version number after cloning 5.0.85
2009-08-11 07:16:52 +02:00
Davi Arnaut
4ead3820d2
Merge from mysql-5.0-bugteam.
2009-08-10 19:47:28 -03:00
hery.ramilison@sun.com
889eea06ee
Merge
2009-08-10 20:53:26 +02:00
Davi Arnaut
eb94a70784
Manual merge.
2009-08-10 15:46:20 -03:00
