Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -1/+1 |
|\ | |||||
| * | Merge the 5.5.22 release build into main 5.5, | Joerg Bruehe | 2012-03-20 | 1 | -0/+17 |
| |\ | |||||
| * \ | Merge from 5.1 to 5.5 | Praveenkumar Hulakund | 2012-02-29 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE... | Praveenkumar Hulakund | 2012-02-29 | 1 | -1/+1 |
* | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -0/+17 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge from mysql-5.1-security to mysql-5.5-security | Jon Olav Hauglid | 2012-01-09 | 1 | -0/+17 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Backport from mysql-trunk of: | Jon Olav Hauglid | 2012-01-09 | 1 | -0/+17 |
| | |/ | |||||
* | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | Bug12589870 post merge fixes - manual merge | Tatjana Azundris Nuernberg | 2011-10-19 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| * | | Merge from 5.1-security | Magne Mahre | 2011-10-07 | 1 | -1/+11 |
| |\ \ | |||||
| * | | | Fixed Bug#12621017 - CRASH IF A SP VARIABLE IS USED IN THE LIMIT CLAUSE OF A | Dmitry Shulga | 2011-08-13 | 1 | -2/+4 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+14 |
|\ \ \ \ | |||||
| * | | | | Fixed valgrind error when storing db_name_length in query_cache. | Michael Widenius | 2011-12-13 | 1 | -5/+6 |
| * | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -5/+33 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -5/+33 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+11 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | |||||
| | | | * | | | Bug12589870 post-merge fixes for Sparc64 and friends | Tatjana Azundris Nuernberg | 2011-10-19 | 1 | -1/+1 |
| | | | | |/ | | | | |/| | |||||
| | | | * | | BUG#12589870 CRASHES WITH MULTIQUERY PACKET + USE<DB> + QUERY CACHE | Magne Mahre | 2011-10-07 | 1 | -1/+11 |
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+22 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -1/+2 |
| | | | |\ \ | |||||
| | | | | * \ | merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-06-06 | 1 | -3/+3 |
| | | | | |\ \ | |||||
| | | | * | \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+17 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | | | | 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 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | |