summaryrefslogtreecommitdiff
path: root/sql/mysql_priv.h
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-02-091-1/+1
|\
| * Bug #45640: optimizer bug produces wrong resultsGleb Shchepa2010-02-061-1/+1
* | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-1/+1
|\ \ | |/
| * WL#5182 Remove more deprecated 4.1/5.0 featuresMagne Mahre2010-01-271-1/+1
* | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-01-301-2/+2
|\ \ | |/
| * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-2/+2
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-2/+16
|\ \ | |/
| * Bug#49501 Inefficient information_schema check (system collation), addonSergey Glukhov2010-01-221-0/+6
| * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-0/+4
| * Bug#49501 Inefficient information_schema check (system collation)Sergey Glukhov2010-01-191-2/+6
* | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-051-32/+25
|\ \
| * \ MergeMikael Ronstrom2009-11-031-28/+16
| |\ \
| | * \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-3/+2
| | |\ \
| | * \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-281-95/+4
| | |\ \ \
| | * \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-231-7/+30
| | |\ \ \ \
| | * \ \ \ \ Merge with next-mr-runtime.Konstantin Osipov2009-10-221-5/+9
| | |\ \ \ \ \
| | | * \ \ \ \ AutomergeKristofer Pettersson2009-10-191-8/+5
| | | |\ \ \ \ \
| | | * | | | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-191-5/+9
| | * | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-15/+2
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Backport of:Konstantin Osipov2009-10-161-6/+1
| | * | | | | | Backport of:Konstantin Osipov2009-10-141-1/+0
| | * | | | | | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-131-0/+2
| | * | | | | | Bug #33693 general log name and location depend on PID file, Magne Mahre2009-10-121-0/+1
| | * | | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-1/+1
| | |/ / / / /
| * | | | | | Fixed a few bugs in hex string generation, in call to val_str for partition e...Mikael Ronstrom2009-11-021-1/+0
| * | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-11-021-3/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#38968 Unused mutex LOCK_bytes_sent, LOCK_bytes_receivedMarc Alff2009-10-291-2/+1
| | * | | | | Bug#38967 Unused mutex LOCK_AclMarc Alff2009-10-291-1/+1
| | | |_|/ / | | |/| | |
| * | | | | Merged WL#3352 into mysql-next-mrMikael Ronstrom2009-10-281-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | A lot of fixes to make character set work ok, first step to fixing BUG#48163Mikael Ronstrom2009-10-221-0/+7
* | | | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-0/+10
|/ / / / /
* | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-95/+4
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | BUG#40337 Fsyncing master and relay log to disk after every event is too slowAlfranio Correia2009-09-291-1/+3
| * | | | BUG#35542 Add option to sync master and relay log to disk after every eventAlfranio Correia2009-09-291-1/+2
| * | | | WL#4828 and BUG#45747Alfranio Correia2009-09-291-94/+0
* | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-4/+19
|\ \ \ \ \
| * | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-4/+19
* | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge from mysql-5.1.Alexander Nozdrin2009-10-191-0/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Addendum to the fix for bug 43029Georgi Kodinov2009-10-081-0/+1
* | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-3/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-3/+2
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | Bug#32430: 'show innodb status' causes errorsMattias Jonsson2009-09-251-3/+2
| | |/ /
* | | | WL#4584 Internationalized number formatAlexander Barkov2009-10-051-2/+10
| |_|/ |/| |
* | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-171-1/+2
|\ \ \ | |/ /
| * | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-161-1/+2
| |\ \ | | |/
| | * mergeMattias Jonsson2009-08-261-1/+2
| | |\
| | | * Bug#32430: 'show innodb status' causes errorsMattias Jonsson2009-08-071-1/+2
* | | | WL#2110 (SIGNAL)Marc Alff2009-09-101-0/+4
|/ / /
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-0/+1
|\ \ \ | |/ /