Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | manual merge from mysql-5.1-bugteam | Jon Olav Hauglid | 2010-08-09 | 1 | -69/+1 |
|\ | |||||
| * | Bug #54106 assert in Protocol::end_statement, | Jon Olav Hauglid | 2010-08-09 | 1 | -68/+1 |
* | | Rename select_send::abort() to select_send::abort_result_set() | Alexander Nozdrin | 2010-07-28 | 1 | -2/+2 |
* | | manual merge from mysql-5.1-bugteam | Jon Olav Hauglid | 2010-07-19 | 1 | -2/+10 |
|\ \ | |/ | |||||
| * | Bug #54734 assert in Diagnostics_area::set_ok_status | Jon Olav Hauglid | 2010-07-19 | 1 | -2/+10 |
* | | Bug #30584: delete with order by and limit clauses does not | Gleb Shchepa | 2010-06-23 | 1 | -24/+17 |
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -4/+4 |
| * | A 5.1-only version of fix for bug #46947 "Embedded SELECT | Dmitry Lenev | 2010-05-28 | 1 | -1/+1 |
* | | Manual merge from mysql-trunk-bugfixing. | Alexander Nozdrin | 2010-06-07 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Auto-merge from mysql-trunk. | Alexander Nozdrin | 2010-05-28 | 1 | -0/+13 |
| |\ \ | |||||
| * \ \ | manual merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-05-18 | 1 | -6/+4 |
| |\ \ \ | |||||
| * | | | | Committing on behalf or Dmitry Lenev: | Konstantin Osipov | 2010-04-28 | 1 | -1/+1 |
* | | | | | Automerge. | Alexey Kopytov | 2010-05-27 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Bug #53830: !table || (!table->read_set || | Alexey Kopytov | 2010-05-25 | 1 | -1/+1 |
* | | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-05-24 | 1 | -0/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug #49756 Rows_examined is always 0 in the slow query log for | Staale Smedseng | 2010-05-12 | 1 | -0/+3 |
* | | | | Manual merge from mysql-trunk. | Alexander Nozdrin | 2010-05-20 | 1 | -6/+4 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Patch for Bug#21818 (Return value of ROW_COUNT() is incorrect | Alexander Nozdrin | 2010-05-14 | 1 | -6/+4 |
| | |/ | |/| | |||||
* | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-04-30 | 1 | -0/+10 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug #47453: InnoDB incorrectly changes TIMESTAMP columns when JOINed | Georgi Kodinov | 2010-04-28 | 1 | -0/+10 |
* | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-04-20 | 1 | -1/+17 |
|\ \ | |||||
| * | | WL#5030: Splitting mysql_priv.h | Mats Kindahl | 2010-04-07 | 1 | -0/+1 |
| * | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+16 |
* | | | Fix assorted compiler warnings. | Davi Arnaut | 2010-03-16 | 1 | -2/+0 |
|/ / | |||||
* | | A review comment for the fix for Bug#46672. | Konstantin Osipov | 2010-03-13 | 1 | -73/+16 |
* | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -18/+80 |
|\ \ | |||||
| * \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-23 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | Bug #43414 Parenthesis (and other) warnings compiling | Staale Smedseng | 2010-02-22 | 1 | -1/+2 |
| * | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -18/+79 |
| |\ \ | | |/ | |||||
| | * | Bug#49534: multitable IGNORE update with sql_safe_updates | Martin Hansson | 2010-02-10 | 1 | -10/+77 |
| | * | BUG#49902 - SELECT returns incorrect results | Sergey Vojtovich | 2010-02-09 | 1 | -8/+1 |
* | | | Fix for bug #50913 "Deadlock between open_and_lock_tables_derived | Dmitry Lenev | 2010-02-08 | 1 | -0/+5 |
* | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -1/+6 |
|\ \ \ | |||||
| * \ \ | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-31 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Manual merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -3/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -3/+4 |
| * | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-19 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-01-15 | 1 | -1/+5 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#48157: crash in Item_field::used_tables | Martin Hansson | 2010-01-12 | 1 | -1/+5 |
* | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -30/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge mysql-next-mr --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-13 | 1 | -4/+5 |
| |\ \ \ | |||||
| * \ \ \ | Manual merge from next-mr. | 2010-01-12 | 1 | -9/+10 | |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -30/+19 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -3/+8 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -15/+18 |
| | * | | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -13/+0 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merged fix for BUG#39934 up a few revisions. | Sven Sandberg | 2009-07-14 | 1 | -13/+0 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | BUG#39934: Slave stops for engine that only support row-based logging | Sven Sandberg | 2009-07-14 | 1 | -13/+0 |
* | | | | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-04 | 1 | -3/+4 |