Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | More merge fixes: | Michael Widenius | 2013-06-16 | 1 | -8/+15 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -23/+0 |
|\ | |||||
| * | Fixed problem with failing mysql_upgrade when proc table was not correct. | Michael Widenius | 2013-01-11 | 1 | -23/+0 |
* | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -2/+0 |
* | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+3 |
|/ | |||||
* | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+4 |
|\ | |||||
| * | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -1/+4 |
* | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ | |||||
| | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| | |\ \ | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -5/+6 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -5/+5 |
| |\ \ \ \ | |||||
| | * | | | | microseconds in log tables: | Sergei Golubchik | 2011-05-19 | 1 | -4/+4 |
| | * | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -1/+1 |
* | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -5/+2 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -1/+14 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Merged the fix for bug #11936829 to 5.5.11 release | Georgi Kodinov | 2011-03-31 | 1 | -0/+1 |
| * | | | | | Bug # 11766011: mysql.user.authentication_string column causes | Georgi Kodinov | 2011-03-18 | 1 | -2/+2 |
| * | | | | | BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64) | Chuck Bell | 2011-03-11 | 1 | -2/+2 |
| * | | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+15 |
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/| | |||||
| | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -0/+15 |
| * | | | | Bug #57551: Live upgrade fails between 5.1.52 -> 5.5.7-rc | Georgi Kodinov | 2010-11-19 | 1 | -1/+8 |
| * | | | | Bug #57916: Fix the naming of the proxy_priv table | Georgi Kodinov | 2010-11-02 | 1 | -1/+1 |
| * | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -0/+5 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -3/+6 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -3/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -2/+19 |
| |\ \ \ | |||||
| * | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -3/+3 |
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -0/+3 |
* | | | | | merge | Georgi Kodinov | 2010-07-05 | 1 | -3/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given table | Georgi Kodinov | 2010-07-01 | 1 | -3/+1 |
| | |/ / | |/| | | |||||
* | | | | A patch for Bug#52444 (mysql_upgrade fails b/w 5.1 -> 5.5 (Celosia)). | Alexander Nozdrin | 2010-04-14 | 1 | -0/+38 |
* | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -5/+1 |
|\ \ \ \ | |||||
| * \ \ \ | Merge in fix for bug#42589 | Magnus Blåudd | 2010-03-15 | 1 | -4/+0 |
| |\ \ \ \ | |||||
| | * | | | | Bug#42589 mysql_fix_privilege_tables.sh to be deprecated | Magnus Blåudd | 2009-10-07 | 1 | -4/+0 |
| * | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-16 | 1 | -0/+30 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Manual resolving for the following files | Andrei Elkin | 2009-12-01 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20... | Andrei Elkin | 2009-11-30 | 1 | -0/+4 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | BUG#48048: Deprecated constructs need removal in Betony | Luis Soares | 2009-11-04 | 1 | -1/+1 |
| | | |_|/ / / / | | |/| | | | | | |||||
* | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-03-07 | 1 | -2/+19 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL | Davi Arnaut | 2010-02-26 | 1 | -2/+19 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2009-12-11 | 1 | -0/+30 |
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | |||||
| * | | | | This is a patch for bug#41569. | unknown | 2009-12-03 | 1 | -0/+30 |
| | |/ / | |/| | | |||||
* | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-11-06 | 1 | -0/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.0-bugteam->5.1-bugteam merge | Sergey Glukhov | 2009-10-27 | 1 | -0/+4 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Bug#41049 does syntax "grant" case insensitive? | Sergey Glukhov | 2009-10-27 | 1 | -0/+4 |
| | * | Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZE... | unknown | 2007-05-19 | 1 | -0/+1 |
* | | | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2009-11-02 | 1 | -0/+5 |
|\ \ \ |