summaryrefslogtreecommitdiff
path: root/client/mysqltest.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-8/+120
|\
| * Bug #37097 mysqltest add result file format version 2Magne Mahre2009-11-111-7/+120
| * Backport of Bug#41860 to mysql-next-mrDavi Arnaut2009-11-101-0/+38
* | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-121-12/+67
|\ \
| * \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-101-1/+0
| |\ \
| * | | Fix manual-merge (2nd attempt).Alexander Nozdrin2009-11-101-2/+0
| * | | Fix manual-merge.Alexander Nozdrin2009-11-091-28/+21
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-21/+85
| |\ \ \ | | |_|/ | |/| |
| | * | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-24/+28
| | |\ \
| | | * | mergeGeorgi Kodinov2009-10-301-24/+28
| | | * | merge from 5.1 mainBjorn Munch2009-10-161-3/+17
| | | |\ \
| | * | \ \ Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+57
| | |\ \ \ \
| | | * | | | Bug #47423 mtr connects to wrong databaseVladislav Vaintroub2009-11-031-0/+57
| | | | |/ / | | | |/| |
| | * | | | new merge from trunkBjorn Munch2009-10-221-2/+11
| | |\ \ \ \ | | | |/ / /
* | | | | | Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sq...Alexey Botchkov2009-11-111-2/+4
| |_|_|_|/ |/| | | |
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-67/+36
|\ \ \ \ \ | |/ / / /
| * | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-0/+3
| |\ \ \ \
| * \ \ \ \ Pull from mysql-next-mr-runtime.Alexander Nozdrin2009-10-161-57/+10
| |\ \ \ \ \
| | * | | | | Backport of 2617.65.4 from 6.0-codebase.Konstantin Osipov2009-10-161-10/+9
| | * | | | | Backport of:Konstantin Osipov2009-10-161-47/+1
| * | | | | | Backporting patch for Bug#38992 from 6.0.Alexander Nozdrin2009-10-161-0/+19
| |/ / / / /
| * | | | | Backport of:Konstantin Osipov2009-10-141-6/+6
| * | | | | Backporting of Bug#40128 from 6.0 to next-mr.Alexander Nozdrin2009-10-091-1/+5
* | | | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-1/+0
| |/ / / / |/| | | |
* | | | | new merge from next-mrBjorn Munch2009-10-221-1/+10
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge 5.0-bugteam-> 5.1-bugteamFrazer Clement2009-10-081-3/+2
| * | | | Merge 5.0-bugteam->5.1 bugteamFrazer Clement2009-10-051-1/+11
| * | | | automergeGeorgi Kodinov2009-09-231-1/+1
| * | | | automergeGeorgi Kodinov2009-09-181-18/+71
| |\ \ \ \
* | \ \ \ \ merge from next-mrBjorn Munch2009-10-181-1/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | |
| * | | | Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-281-1/+1
| |\ \ \ \
| | * | | | Upmerge 5.0-build -> 5.1-build.Joerg Bruehe2009-09-281-1/+1
| | | |/ / | | |/| |
* | | | | merge from mtr-51Bjorn Munch2009-10-081-0/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Bug #47218 mysqltest ignores "error" command inside if inside loopBjorn Munch2009-10-081-0/+1
| |/ /
| * | second merge from main, with adaptionsBjorn Munch2009-09-021-8/+7
| |\ \
| * \ \ first merge from mainBjorn Munch2009-09-021-17/+21
| |\ \ \
* | \ \ \ new merge from trunkBjorn Munch2009-09-181-9/+13
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | A patch for Bug#45118 (mysqld.exe crashed in debug modeAlexander Nozdrin2009-09-101-1/+6
| | |_|/ | |/| |
| * | | Merge from 5.0 for 43414Staale Smedseng2009-08-281-8/+7
| | |/ | |/|
* | | initial merge from 5.1-mtrBjorn Munch2009-09-041-18/+71
|\ \ \ | |/ / |/| / | |/
| * Bug #32296 mysqltest fails to parse "append_file" inside a "while", it works ...Bjorn Munch2009-09-021-10/+46
| * mergeBjorn Munch2009-09-011-2/+7
| |\
| | * Bug #39003 mtr's diff_files command failed in pushbuild without printing a re...Bjorn Munch2009-08-191-2/+7
| * | Bug #46164 memory leak in mysqltest after parse error with --debugBjorn Munch2009-08-181-3/+4
| |/
| * Bug #44012 mtr: test cases that are not supposed to return output always failBjorn Munch2009-08-111-3/+14
* | Merge from 5.1 main.Davi Arnaut2009-06-081-4/+56
|\ \ | |/
| * merge from 5.1 mainBjorn Munch2009-05-291-1/+3
| |\
| * | cherry picking fix for Bug #39542 from 6.0-runtimeBjorn Munch2009-05-271-1/+40
| * | Bug #44964 mysqltest: connection <connection><some spaces>; fails nowBjorn Munch2009-05-261-1/+1
| * | Bug #44922 mysqltest's query_get_value function can't work with queries conta...Bjorn Munch2009-05-251-2/+15