Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 1 | -8/+120 |
|\ | |||||
| * | Bug #37097 mysqltest add result file format version 2 | Magne Mahre | 2009-11-11 | 1 | -7/+120 |
| * | Backport of Bug#41860 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -0/+38 |
* | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 1 | -12/+67 |
|\ \ | |||||
| * \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-10 | 1 | -1/+0 |
| |\ \ | |||||
| * | | | Fix manual-merge (2nd attempt). | Alexander Nozdrin | 2009-11-10 | 1 | -2/+0 |
| * | | | Fix manual-merge. | Alexander Nozdrin | 2009-11-09 | 1 | -28/+21 |
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -21/+85 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -24/+28 |
| | |\ \ | |||||
| | | * | | merge | Georgi Kodinov | 2009-10-30 | 1 | -24/+28 |
| | | * | | merge from 5.1 main | Bjorn Munch | 2009-10-16 | 1 | -3/+17 |
| | | |\ \ | |||||
| | * | \ \ | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -0/+57 |
| | |\ \ \ \ | |||||
| | | * | | | | Bug #47423 mtr connects to wrong database | Vladislav Vaintroub | 2009-11-03 | 1 | -0/+57 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | new merge from trunk | Bjorn Munch | 2009-10-22 | 1 | -2/+11 |
| | |\ \ \ \ | | | |/ / / | |||||
* | | | | | | Bug#42520 killing load .. infile Assertion failed: ! is_set(), file .\sq... | Alexey Botchkov | 2009-11-11 | 1 | -2/+4 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-05 | 1 | -67/+36 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge from mysql-next-mr. | Alexander Nozdrin | 2009-10-23 | 1 | -0/+3 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Pull from mysql-next-mr-runtime. | Alexander Nozdrin | 2009-10-16 | 1 | -57/+10 |
| |\ \ \ \ \ | |||||
| | * | | | | | Backport of 2617.65.4 from 6.0-codebase. | Konstantin Osipov | 2009-10-16 | 1 | -10/+9 |
| | * | | | | | Backport of: | Konstantin Osipov | 2009-10-16 | 1 | -47/+1 |
| * | | | | | | Backporting patch for Bug#38992 from 6.0. | Alexander Nozdrin | 2009-10-16 | 1 | -0/+19 |
| |/ / / / / | |||||
| * | | | | | Backport of: | Konstantin Osipov | 2009-10-14 | 1 | -6/+6 |
| * | | | | | Backporting of Bug#40128 from 6.0 to next-mr. | Alexander Nozdrin | 2009-10-09 | 1 | -1/+5 |
* | | | | | | backport of dbug extensions from 6.0: | Sergei Golubchik | 2009-10-30 | 1 | -1/+0 |
| |/ / / / |/| | | | | |||||
* | | | | | new merge from next-mr | Bjorn Munch | 2009-10-22 | 1 | -1/+10 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge 5.0-bugteam-> 5.1-bugteam | Frazer Clement | 2009-10-08 | 1 | -3/+2 |
| * | | | | Merge 5.0-bugteam->5.1 bugteam | Frazer Clement | 2009-10-05 | 1 | -1/+11 |
| * | | | | automerge | Georgi Kodinov | 2009-09-23 | 1 | -1/+1 |
| * | | | | automerge | Georgi Kodinov | 2009-09-18 | 1 | -18/+71 |
| |\ \ \ \ | |||||
* | \ \ \ \ | merge from next-mr | Bjorn Munch | 2009-10-18 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | / / | |_|_|/ / |/| | | | | |||||
| * | | | | Merge 5.1-build up into 5.4-build ("trunk-build"). | Joerg Bruehe | 2009-09-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Upmerge 5.0-build -> 5.1-build. | Joerg Bruehe | 2009-09-28 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
* | | | | | merge from mtr-51 | Bjorn Munch | 2009-10-08 | 1 | -0/+1 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Bug #47218 mysqltest ignores "error" command inside if inside loop | Bjorn Munch | 2009-10-08 | 1 | -0/+1 |
| |/ / | |||||
| * | | second merge from main, with adaptions | Bjorn Munch | 2009-09-02 | 1 | -8/+7 |
| |\ \ | |||||
| * \ \ | first merge from main | Bjorn Munch | 2009-09-02 | 1 | -17/+21 |
| |\ \ \ | |||||
* | \ \ \ | new merge from trunk | Bjorn Munch | 2009-09-18 | 1 | -9/+13 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | A patch for Bug#45118 (mysqld.exe crashed in debug mode | Alexander Nozdrin | 2009-09-10 | 1 | -1/+6 |
| | |_|/ | |/| | | |||||
| * | | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -8/+7 |
| | |/ | |/| | |||||
* | | | initial merge from 5.1-mtr | Bjorn Munch | 2009-09-04 | 1 | -18/+71 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug #32296 mysqltest fails to parse "append_file" inside a "while", it works ... | Bjorn Munch | 2009-09-02 | 1 | -10/+46 |
| * | merge | Bjorn Munch | 2009-09-01 | 1 | -2/+7 |
| |\ | |||||
| | * | Bug #39003 mtr's diff_files command failed in pushbuild without printing a re... | Bjorn Munch | 2009-08-19 | 1 | -2/+7 |
| * | | Bug #46164 memory leak in mysqltest after parse error with --debug | Bjorn Munch | 2009-08-18 | 1 | -3/+4 |
| |/ | |||||
| * | Bug #44012 mtr: test cases that are not supposed to return output always fail | Bjorn Munch | 2009-08-11 | 1 | -3/+14 |
* | | Merge from 5.1 main. | Davi Arnaut | 2009-06-08 | 1 | -4/+56 |
|\ \ | |/ | |||||
| * | merge from 5.1 main | Bjorn Munch | 2009-05-29 | 1 | -1/+3 |
| |\ | |||||
| * | | cherry picking fix for Bug #39542 from 6.0-runtime | Bjorn Munch | 2009-05-27 | 1 | -1/+40 |
| * | | Bug #44964 mysqltest: connection <connection><some spaces>; fails now | Bjorn Munch | 2009-05-26 | 1 | -1/+1 |
| * | | Bug #44922 mysqltest's query_get_value function can't work with queries conta... | Bjorn Munch | 2009-05-25 | 1 | -2/+15 |