summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Merge with latest MariaDB 5.1 trunk.unknown2009-10-151-1/+0
|\
| * mergeunknown2009-10-061-1/+0
| |\
| | * BUG#39249 Maria:query cache returns out of date resultsunknown2009-10-061-1/+0
* | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-1/+2
|\ \ \ | |/ / |/| |
| * | mergeMattias Jonsson2009-08-261-1/+2
| |\ \
| | * | Bug#32430: 'show innodb status' causes errorsMattias Jonsson2009-08-071-1/+2
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-6/+20
|\ \ \ \ | | |_|/ | |/| |
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+1
| |\ \ \
| | * | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-0/+1
| * | | | MWL#17: Table elimination: last fixesSergey Petrunya2009-08-241-6/+19
| |/ / /
* | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-32/+73
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-20/+36
| |\ \ | | |/ | |/|
| | * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-6/+23
| | |\
| | * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-20/+36
| * | | Code review for Bug#43587 Putting event_scheduler=1 in init SQL file crashes Konstantin Osipov2009-07-241-0/+1
| | |/ | |/|
| * | Merge bug#45326Magnus Blåudd2009-06-051-5/+5
| |\ \
| | * | Bug#45326 Linker failure for libmysqld with VC++ 2008Magnus Blåudd2009-06-051-5/+5
| * | | merge into mysql-5.1-bugteamMattias Jonsson2009-06-021-0/+10
| |\ \ \
| | * | | Bug#32430:'show innodb status' causes errors Invalid (old?) tableMattias Jonsson2009-06-021-0/+10
| | | |/ | | |/|
| * | | merge to 5.1-bugteam treeSatya B2009-06-021-1/+2
| |\ \ \
| | * | | Fix for BUG#10206 - InnoDB: Transaction requiring Max_BinLog_Cache_size > 4GBSatya B2009-05-151-1/+2
| | |/ /
| * | | Manual merge.Alexey Kopytov2009-06-011-0/+6
| |\ \ \ | | |/ / | |/| |
| | * | Bug #44767: invalid memory reads in password() and Alexey Kopytov2009-05-271-0/+6
| | * | Merge community up to enterprise, thus ending the community-serverChad MILLER2009-05-061-1/+23
| | |\ \
| | | * | Pull 5.1 treatment of community features into 5.0.Chad MILLER2009-05-051-0/+2
| | | * | Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-0/+2
| | | |\ \
| | | * \ \ Merge from Tim's 5.0.76-release tree to make 5.0.77 .Chad MILLER2009-01-211-2/+8
| | | |\ \ \
| | | * \ \ \ Merged from 5.0 (enterprise).Chad MILLER2008-12-171-4/+9
| | | |\ \ \ \
| | | * | | | | Bug#37428 Potential security issue with UDFs - linux shellcode execution.Alexey Botchkov2008-07-281-0/+3
| | | * | | | | Merge from 5.0 trunk.Chad MILLER2008-07-141-7/+14
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-0/+2
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-1/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-1/+21
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Push history-limiting code until after the code that adds new unknown2007-11-141-0/+14
| | | | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-1/+7
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-1/+7
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-1/+7
| | | | | | |\ \ \ \ \ \ \ \
| | * | | | | \ \ \ \ \ \ \ \ Auto mergeHe Zhenxing2009-04-081-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ...He Zhenxing2009-03-271-0/+7
| | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Automerge.Alexey Kopytov2009-03-271-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | Manual merge.Alexey Kopytov2009-03-271-0/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Fix for bug #43432: Union on floats does unnecessary rounding Alexey Kopytov2009-03-271-0/+5
| | | |/ / / / / / / / / / /
* | | | | | | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Fix wrong parameter name which caused compile failure on windowsSergey Petrunia2009-03-161-1/+1
| * | | | | | | | | | | | | Merge Sergey Petrunia2009-03-141-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Bug#42610 Dynamic plugin broken in 5.1.31Sergey Glukhov2009-03-131-0/+3
| * | | | | | | | | | | | | @@optimizer_switch backport and change from no_xxx to xx=on|off: post-review ...Sergey Petrunia2009-03-141-0/+1
| * | | | | | | | | | | | | Change optimizer_switch from no_xxx to xxx=on/xx=off.Sergey Petrunia2009-03-111-5/+16
| * | | | | | | | | | | | | MergeSergey Petrunia2009-03-101-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | - Backport @@optimizer_switch support from 6.0Sergey Petrunia2009-02-231-0/+6
View Lorry Controller Status