summaryrefslogtreecommitdiff
path: root/include/my_sys.h
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-06-011-6/+2
|\
| * Backport: remove dead code.Davi Arnaut2010-05-281-6/+2
* | Merge a change from mysql-5.1-innodb:Marko Mäkelä2010-05-201-2/+15
|/
* WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-0/+3
* Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-241-8/+25
|\
| * mergeVladislav Vaintroub2010-02-161-0/+3
| |\
| | * Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-1/+0
| | |\
| | * \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-6/+7
| | |\ \
| | * \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-1/+1
| | |\ \ \
| | * \ \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-1/+11
| | |\ \ \ \
| | * | | | | Backport of:Konstantin Osipov2009-12-031-0/+3
| * | | | | | mergeVladislav Vaintroub2009-12-191-1/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-6/+7
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-161-1/+0
| | |\ \ \ \ \
| * | \ \ \ \ \ mergeVladislav Vaintroub2009-12-191-6/+7
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | * | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-6/+7
| | | |_|_|/ / | | |/| | | |
| * | | | | | mergeVladislav Vaintroub2009-12-111-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-041-1/+11
| | |\ \ \ \ \ | | | |/ / / / | | | | | | / | | | |_|_|/ | | |/| | |
| | * | | | Bug#47126 equal flag values causing unexpected behaviourAlexey Botchkov2009-11-111-1/+1
| | | |_|/ | | |/| |
| * | | | mergeVladislav Vaintroub2009-12-041-1/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | WL#2360 Performance schemaMarc Alff2009-11-301-1/+11
| | |/ /
| * | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-0/+3
| |/ /
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-071-1/+1
|\ \ \ | |_|/ |/| |
| * | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-261-1/+1
* | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-161-1/+0
|\ \ \ | |/ / | | / | |/ |/|
| * Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-121-1/+0
* | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-0/+2
* | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-221-0/+1
|\ \
| * | Backport BUG#25192 Using relay-log and relay-log-index without values produce...He Zhenxing2009-10-021-0/+1
* | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-2/+5
|\ \ \
| * | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+3
| * | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-151-1/+2
* | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-1/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus Blåudd2009-10-061-1/+0
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-0/+10
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+10
* | | backport of Vladislav Vaintroub2009-09-301-1/+1
* | | merge mysql-next-mr-alikVladislav Vaintroub2009-09-241-11/+20
|\ \ \
| * \ \ Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-171-0/+1
| |\ \ \ | | |/ /
| * | | WL#2110 (SIGNAL)Marc Alff2009-09-101-11/+20
| | |/ | |/|
* | | mergeVladislav Vaintroub2009-09-231-0/+1
|\ \ \ | | |/ | |/|
| * | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-09-031-0/+1
| |\ \ | | |/ | |/|
| | * Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for Satya B2009-09-031-0/+1
| | * Bug #45287: phase 2 : 5.0 64 bit compilation warningsGeorgi Kodinov2009-07-161-1/+1
| | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-1/+2
| | |\
| | | * auto-mergeIgnacio Galarza2009-03-191-0/+1
| | | |\
| | | * | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-1/+1
| | * | | Buq#32167 another privilege bypass with DATA/INDEX DIRECTORY.Alexey Botchkov2008-07-311-0/+1
| | * | | Merge fix for bug#38180 from mysql-5.0.66a-releaseJonathan Perkin2008-07-181-0/+1
| | |\ \ \