Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -5/+3 |
|\ | |||||
| * | Manual merge from mysql-trunk. | Alexander Nozdrin | 2009-12-11 | 15 | -268/+217 |
| |\ | |||||
| * \ | merge to mysql-5.1-bugteam | Satya B | 2009-11-26 | 1 | -3/+1 |
| |\ \ | |||||
| | * \ | auto-merge | Tatiana A. Nurnberg | 2009-11-24 | 1 | -3/+1 |
| | |\ \ | |||||
| | | * | | Bug#47655: Memory free error when connecting to 4.1 server from 5.1+ client | Tatiana A. Nurnberg | 2009-11-02 | 1 | -3/+1 |
| * | | | | Fix for BUG#47671 - wrong character-set after upgrade from 5.1.34 to 5.1.39 | Satya B | 2009-11-25 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Post-merge fixes: fix typo and remove unused variables. | Davi Arnaut | 2009-11-21 | 1 | -4/+1 |
* | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-02 | 1 | -1/+18 |
|\ \ \ \ | |||||
| * \ \ \ | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -1/+18 |
| |\ \ \ \ | |||||
| | * \ \ \ | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 3 | -37/+126 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | merge | Vladislav Vaintroub | 2009-11-03 | 3 | -38/+57 |
| | | |\ \ \ | |||||
| | * | | | | | Bug #48463 backporting from 6.0-rpl to celosia a set of bugs | Andrei Elkin | 2009-11-20 | 1 | -1/+18 |
| | * | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-13 | 1 | -1/+1 |
| | * | | | | | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest) | Luis Soares | 2009-11-13 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -1/+1 |
| | * | | | | | | merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640 | Andrei Elkin | 2009-11-06 | 7 | -12/+81 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
* | | | | | | | | Manual merge/pull from mysql-next-mr. | Alexander Nozdrin | 2009-11-25 | 6 | -24/+24 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Backport of: | Konstantin Osipov | 2009-11-24 | 6 | -24/+24 |
* | | | | | | | | Merge with next-mr | Konstantin Osipov | 2009-11-20 | 8 | -26/+430 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Manual merge of mysql-next-mr-runtime upstream. | Davi Arnaut | 2009-11-19 | 8 | -26/+430 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | Bug #33544 UDF_INIT member decimals initialized wrong with | Magne Mahre | 2009-11-11 | 2 | -4/+1 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Bug #33544: UDF_INIT member decimals initialized wrong with | gkodinov/kgeorge@magare.gmz | 2008-03-05 | 2 | -4/+1 |
| | * | | | | | | | Bug #37097 mysqltest add result file format version 2 | Magne Mahre | 2009-11-11 | 1 | -7/+120 |
| | * | | | | | | | Return type fix (strlen returns size_t) | Magne Mahre | 2009-11-11 | 1 | -1/+1 |
| | * | | | | | | | Bug #5724 'mysqladmin password' should be allowed to prompt for password | Magne Mahre | 2009-11-11 | 1 | -9/+30 |
| | * | | | | | | | Backport of Bug#41860 to mysql-next-mr | Davi Arnaut | 2009-11-10 | 1 | -0/+38 |
| | * | | | | | | | Fix compile error on HP/UX. | Magne Mahre | 2009-11-05 | 1 | -3/+3 |
| | * | | | | | | | BUG #8368 "mysqldump needs --slave-data option" | Magne Mahre | 2009-11-04 | 2 | -0/+186 |
| | * | | | | | | | Bug#26780: automatic vertical output for wide results | Magne Mahre | 2009-11-04 | 2 | -3/+91 |
| | * | | | | | | | Bug#35224: mysqldump --help is very confusing | Magne Mahre | 2009-11-03 | 2 | -2/+2 |
* | | | | | | | | | merging. | Alexey Botchkov | 2009-11-17 | 10 | -12/+28 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | Bug#47216 programs should quit if the file specified by --defaults-file ... | Alexey Botchkov | 2009-10-09 | 10 | -13/+28 |
* | | | | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-12 | 3 | -25/+108 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | 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 | 3 | -34/+126 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | 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.0-main | Georgi Kodinov | 2009-10-30 | 1 | -24/+28 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge from mysql-5.0.87-release | karen.langford@sun.com | 2009-10-26 | 1 | -24/+28 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | Added make targets 'test-bt-fast' and 'test-bt-debug-fast' | Hery Ramilison | 2009-10-15 | 1 | -27/+28 |
| | * | | | | | | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -5/+7 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders... | 2009-10-28 | 1 | -5/+7 | |
| | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2009-11-05 | 1 | -6/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | |||||
| | | * | | | | | | | | | | merged 5.1-main-> 5.1-bugteam | Georgi Kodinov | 2009-10-23 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | | merge from 5.1 main | Bjorn Munch | 2009-10-16 | 7 | -12/+80 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | \ \ \ \ \ \ \ \ \ | auto-merge | Tatiana A. Nurnberg | 2009-10-20 | 1 | -7/+5 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | manual merge of 28141 | Tatiana A. Nurnberg | 2009-10-20 | 1 | -6/+20 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / | | | |/| | | / / / / / / / / | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | | | |||||
| | | | * | | | | | | | | | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd... | Tatiana A. Nurnberg | 2009-10-19 | 1 | -3/+19 |
| | | | | |_|/ / / / / / / | | | | |/| | | | | | | | |