summaryrefslogtreecommitdiff
path: root/scripts/mysql_system_tables_fix.sql
Commit message (Expand)AuthorAgeFilesLines
* More merge fixes:Michael Widenius2013-06-161-8/+15
* 10.0-base mergeSergei Golubchik2013-01-311-23/+0
|\
| * Fixed problem with failing mysql_upgrade when proc table was not correct.Michael Widenius2013-01-111-23/+0
* | fixes for test failuresSergei Golubchik2012-09-271-2/+0
* | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-0/+3
|/
* 5.3->5.5 mergeSergei Golubchik2011-11-221-1/+4
|\
| * Allow one to block an account by using GRANT max_user_connections = -1Michael Widenius2011-09-261-1/+4
* | mysql-5.5.18 mergeSergei Golubchik2011-11-031-1/+1
|\ \
| * \ Updated/added copyright headersKent Boortz2011-06-301-1/+1
| |\ \
| | * \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | |\ \
| | | * | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | merge with 5.3Sergei Golubchik2011-10-191-5/+6
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-5/+5
| |\ \ \ \
| | * | | | microseconds in log tables:Sergei Golubchik2011-05-191-4/+4
| | * | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-1/+1
* | | | | | post-merge fixes.Sergei Golubchik2011-07-021-5/+2
* | | | | | 5.5-mergeSergei Golubchik2011-07-021-1/+14
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merged the fix for bug #11936829 to 5.5.11 release Georgi Kodinov2011-03-311-0/+1
| * | | | | Bug # 11766011: mysql.user.authentication_string column causes Georgi Kodinov2011-03-181-2/+2
| * | | | | BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64)Chuck Bell2011-03-111-2/+2
| * | | | | MergeKent Boortz2010-12-291-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | MergeKent Boortz2010-12-291-0/+15
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | - Added/updated copyright headersKent Boortz2010-12-281-0/+15
| * | | | Bug #57551: Live upgrade fails between 5.1.52 -> 5.5.7-rcGeorgi Kodinov2010-11-191-1/+8
| * | | | Bug #57916: Fix the naming of the proxy_priv tableGeorgi Kodinov2010-11-021-1/+1
| * | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-0/+5
* | | | | merge.Sergei Golubchik2010-11-251-3/+6
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | merge with 5.1Sergei Golubchik2010-09-111-3/+1
| |\ \ \ | | |/ /
| * | | merge 5.1->5.2Sergei Golubchik2010-06-011-2/+19
| |\ \ \
| * | | | MWL#43 CREATE TABLE options (by Sanja)Sergei Golubchik2010-04-081-3/+3
| * | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-0/+3
* | | | | mergeGeorgi Kodinov2010-07-051-3/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given tableGeorgi Kodinov2010-07-011-3/+1
| | |/ / | |/| |
* | | | A patch for Bug#52444 (mysql_upgrade fails b/w 5.1 -> 5.5 (Celosia)).Alexander Nozdrin2010-04-141-0/+38
* | | | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-5/+1
|\ \ \ \
| * \ \ \ Merge in fix for bug#42589Magnus Blåudd2010-03-151-4/+0
| |\ \ \ \
| | * | | | Bug#42589 mysql_fix_privilege_tables.sh to be deprecatedMagnus Blåudd2009-10-071-4/+0
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-0/+30
| |\ \ \ \ \
| * \ \ \ \ \ Manual resolving for the following filesAndrei Elkin2009-12-011-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-0/+4
| | |\ \ \ \ \ \
| | * | | | | | | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-1/+1
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-2/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |
| * | | | | | Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULLDavi Arnaut2010-02-261-2/+19
| | |_|_|/ / | |/| | | |
* | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-0/+30
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | |
| * | | | This is a patch for bug#41569.unknown2009-12-031-0/+30
| | |/ / | |/| |
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+4
|\ \ \ \ | |/ / /
| * | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-10-271-0/+4
| |\ \ \ | | |/ / | |/| / | | |/
| | * Bug#41049 does syntax "grant" case insensitive?Sergey Glukhov2009-10-271-0/+4
| | * Bug #28401 mysql_upgrade Failed with STRICT_ALL_TABLES, ANSI_QUOTES and NO_ZE...unknown2007-05-191-0/+1
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+5
|\ \ \