Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -2/+2 |
|\ | |||||
| * | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ... | Michael Widenius | 2011-09-23 | 1 | -6/+3 |
| * | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -3/+6 |
| |\ | |||||
| | * | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -3/+6 |
* | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -2/+2 |
* | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+5 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge from mysql-5.5.14-release | unknown | 2011-07-06 | 1 | -2/+3 |
| |\ \ \ | |||||
| | * \ \ | merged mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-06-06 | 1 | -9/+9 |
| | |\ \ \ | |||||
| | * \ \ \ | weave merge of mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-05-10 | 1 | -3/+4 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge from mysql-5.1-security to mysql-5.5-security | Jon Olav Hauglid | 2011-04-11 | 1 | -2/+3 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge from mysql-5.0-security to mysql-5.1-security | Jon Olav Hauglid | 2011-04-11 | 1 | -1/+2 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Bug#11882603 SELECT_ACL ON ANY COLUMN IN MYSQL.PROC ALLOWS TO SEE | Jon Olav Hauglid | 2011-04-11 | 1 | -1/+2 |
| * | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
* | | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -13/+5 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| * | | | | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||||
| | | * | | | | | | | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -0/+3 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -0/+3 |
| * | | | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -13/+1 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| | * | | | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -13/+1 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | |||||
* | | | | | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -29/+88 |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Manual-merge of patch for bug#11753738 from mysql-5.1 tree. | Dmitry Shulga | 2011-06-10 | 1 | -1/+16 |
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| | * | | | | | | | | | Fixed bug#11753738 (formely known as bug#45235) - 5.1 DOES NOT SUPPORT 5.0-ONLY | Dmitry Shulga | 2011-06-10 | 1 | -0/+15 |
| * | | | | | | | | | | merge from latest 5.5 | Guilhem Bichot | 2011-05-21 | 1 | -7/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge 5.5 | Mikael Ronström | 2011-04-15 | 1 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Changed prefix from ES_ to STMT_ on Query arena state | Mikael Ronstrom | 2011-03-04 | 1 | -7/+7 |
| | * | | | | | | | | | | merge | Mikael Ronstrom | 2011-03-04 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | BUG#59549, fix compiler error on Windows, step 2 | Mikael Ronstrom | 2011-01-20 | 1 | -7/+7 |
| * | | | | | | | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | / / / / / / / | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -3/+3 |
| | | |_|_|_|/ / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | A patch for Bug#11763166 (55847: SHOW WARNINGS returns empty | Alexander Nozdrin | 2011-04-15 | 1 | -3/+4 |
| | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | WL#5670: Proposal: Remove SHOW NEW MASTER statement | Sven Sandberg | 2011-02-16 | 1 | -1/+0 |
| | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | merge mysql-5.5->mysql-5.5-bugteam | Georgi Kodinov | 2010-12-16 | 1 | -7/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Bug#45445: cannot execute procedures with thread_stack set to 128k. | Alexander Nozdrin | 2010-11-24 | 1 | -7/+4 |
| * | | | | | | | | Bug #58350: 5.5.7-rc compile failed at sp_head.cc | Georgi Kodinov | 2010-12-08 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteam | Jon Olav Hauglid | 2010-11-18 | 1 | -2/+12 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW over | Konstantin Osipov | 2010-11-12 | 1 | -0/+5 |
| | * | | | | | | | Merge from mysql-5.5-bugteam to mysql-5.5-runtime | Jon Olav Hauglid | 2010-11-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -2/+7 |
| * | | | | | | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well. | Alexander Barkov | 2010-11-18 | 1 | -5/+2 |
| | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Auto-merge from mysql-5.1-bugteam for bug#54375. | Dmitry Shulga | 2010-11-11 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| / / / / / / | | |/ / / / / / | |||||
| | * | | | | | | Fixed bug#54375 - Error in stored procedure leaves connection | Dmitry Shulga | 2010-11-11 | 1 | -1/+1 |
| * | | | | | | | Patch for Bug#55850 (Trigger warnings not cleared). | Alexander Nozdrin | 2010-10-26 | 1 | -6/+20 |
| * | | | | | | | Fixed bug#45445 - cannot execute procedures with thread_stack | Dmitry Shulga | 2010-10-21 | 1 | -4/+7 |
| * | | | | | | | Reverting a patch for Bug#45445 (cannot execute procedures with thread_stack ... | Alexander Nozdrin | 2010-10-13 | 1 | -1/+4 |
| * | | | | | | | A follow up for the patch for Bug#45445, increase stack size | Dmitry Shulga | 2010-10-12 | 1 | -2/+3 |
| * | | | | | | | Fixed bug#45445 - cannot execute procedures with thread_stack | Dmitry Shulga | 2010-10-07 | 1 | -2/+21 |