Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ | |||||
| * | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -2/+2 |
| * | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -1/+1 |
* | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -8/+5 |
* | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -42/+115 |
|\ \ | |||||
| * | | Bug #58414 mysql_upgrade fails on dump upgrade between 5.1.53 -> 5.5.8 | Jon Olav Hauglid | 2010-11-30 | 1 | -0/+2 |
| * | | Bug#45445: cannot execute procedures with thread_stack set to 128k. | Alexander Nozdrin | 2010-11-24 | 1 | -6/+0 |
| * | | Bug #57663 Concurrent statement using stored function and DROP DATABASE | Jon Olav Hauglid | 2010-11-17 | 1 | -0/+100 |
| * | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -10/+13 |
| * | | Fixed bug#45445 - cannot execute procedures with thread_stack | Dmitry Shulga | 2010-10-21 | 1 | -0/+6 |
| * | | Fix for bug#57061 "User without privilege on routine can | Dmitry Lenev | 2010-10-07 | 1 | -32/+0 |
| * | | Bug #56137 "Assertion `thd->lock == 0' failed on upgrading | Dmitry Lenev | 2010-08-31 | 1 | -0/+4 |
* | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -10/+14 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -2/+2 |
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -15/+16 |
| |\ \ \ | | |/ / | |||||
| | * | | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -1/+6 |
| | |\ \ | |||||
| * | | | | few small MySQL bugs/issues that impact the engines, as discussed in the SE s... | Sergei Golubchik | 2010-06-05 | 1 | -8/+8 |
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| * | | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -1/+2 |
| * | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -5/+23 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -16/+193 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -8/+11 |
* | | | | | | | | | Cherry-picking patch for Bug#56137 from mysql-5.5-runtime. | Alexander Nozdrin | 2010-08-31 | 1 | -0/+4 |
| |_|_|_|_|_|_|/ |/| | | | | | | | |||||
* | | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -8/+8 |
* | | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-06-11 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Manual merge from the bugfix tree. | Alexey Kopytov | 2010-06-11 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Bug #42064: low memory crash when importing hex strings, in | Alexey Kopytov | 2010-05-21 | 1 | -1/+6 |
| | | |_|_|_|/ | | |/| | | | | |||||
* | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -9/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -14/+10 |
| |/ / / / / | |||||
| * | | | | | Bug#47736 killing a select from a view when the view is processing a function... | Sergey Glukhov | 2010-02-05 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Manual merge with Conflicts: | unknown | 2010-01-25 | 1 | -5/+8 |
| |\ \ \ \ | |||||
| | * | | | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -5/+8 |
* | | | | | | Bug #51839 mixup of DDL causes slave to stop | unknown | 2010-04-28 | 1 | -14/+16 |
* | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+12 |
* | | | | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-02-15 | 1 | -9/+15 |
|\ \ \ \ \ \ | |||||
| * | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mr | Luis Soares | 2010-02-10 | 1 | -0/+3 |
| * | | | | | | BUG#51021: current_stmt_binlog_row_based not removed in next-mr | Luis Soares | 2010-02-09 | 1 | -9/+12 |
* | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-06 | 1 | -0/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+13 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | Auto-merge from mysql-5.1-bugteam. | Alexander Nozdrin | 2010-01-30 | 1 | -0/+13 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Bug #49132 Replication failure on temporary table + DDL | unknown | 2010-01-22 | 1 | -0/+13 |
| | | |/ / / / | |||||
* | | | | | | | Merge next-mr -> next-4284. | Konstantin Osipov | 2010-02-05 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2010-01-21 | 1 | -6/+8 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-merge | Alfranio Correia | 2010-01-07 | 1 | -6/+8 |
| | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1 | Alfranio Correia | 2009-12-17 | 1 | -6/+8 |
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | | * | | | | | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ... | Andrei Elkin | 2009-11-30 | 1 | -2/+2 |
| | | | |\ \ \ \ \ | | | | | | |_|_|/ | | | | | |/| | | | |||||
| | | | * | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -1/+1 |
| | | | * | | | | | merged fixes for BUG#39934 to 5.1-rpl+3 | Sven Sandberg | 2009-09-30 | 1 | -5/+7 |
| | | | |\ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | | |