summaryrefslogtreecommitdiff
path: root/include/my_sys.h
Commit message (Expand)AuthorAgeFilesLines
* Added macros to inform valgrind that memory is uninitializedMichael Widenius2010-05-261-2/+0
* Merge with MySQL 5.1.47Michael Widenius2010-05-261-1/+1
|\
* \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-1/+1
|\ \ | |/
| * Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-261-1/+1
* | Automerge MySQL 5.1.44 merge into latest MariaDB trunk.unknown2010-03-101-1/+0
|\ \
| * \ Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+0
| |\ \ | | |/
| | * Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-121-1/+0
* | | Added count of my_sync calls (to SHOW STATUS)Michael Widenius2010-03-091-0/+1
|/ /
* | Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+11
|\ \ | |/
| * Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus BlÄudd2009-10-061-1/+0
| * WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+10
| * 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
| | |\ \ \
| | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-0/+6
| | |\ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+1
| | |\ \ \ \ \
| | | * | | | | Push history-limiting code until after the code that adds new unknown2007-11-141-0/+1
* | | | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-5/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-141-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-051-1/+1
| * | | | | | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-4/+4
| |/ / / / / / /
* | | | | | | | Merge of Percona XtraDB into MariaDB.unknown2009-06-111-0/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-111-0/+3
* | | | | | | | | After-merge fixes for problems seen in buildbot after merging MySQL-5.1.35.unknown2009-05-221-0/+4
* | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Manual merge of patch for bug #40552 into the team tree.Alexey Kopytov2009-03-161-2/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix for bug #40552: Race condition around default_directories Alexey Kopytov2009-02-271-2/+5
* | | | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteamHe Zhenxing2009-03-061-0/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | BUG#22082 Slave hangs(holds mutex) on "disk full"He Zhenxing2009-03-061-0/+1
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-3/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | / / / / / | |_|/ / / / / |/| | | | | |
| * | | | | | Bug#37995 Error message truncation in test "innodb" in embedded mode.Alexey Botchkov2009-02-051-3/+0
* | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-1/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mergingAlexey Botchkov2008-08-231-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.Alexey Botchkov2008-08-221-0/+1
| | | |_|_|/ | | |/| | |
| * | | | | Fix merge problem: make sf_malloc_cur_memory definitions match in headers and...Sergey Petrunia2008-08-201-1/+1
| * | | | | Up-merge 5.0.66a-release changes (via 5.0) into 5.1.Timothy Smith2008-07-171-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnfTimothy Smith2008-07-161-0/+1
| | | |_|/ | | |/| |
| | * | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2008-01-301-0/+6
| | |\ \ \ | | | |/ / | | |/| |
| | * | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-041-0/+4
| | |\ \ \
| | | * \ \ Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-11-141-0/+2
| | | |\ \ \
| | | | * \ \ Merge mysql.com:/home/svoj/devel/mysql/BUG31159/mysql-4.1-enginesunknown2007-10-241-0/+2
| | | | |\ \ \
| | | | | * | | BUG#31159 - fulltext search on ucs2 column crashes serverunknown2007-10-241-0/+2
| | | * | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2007-11-071-0/+2
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| * | | | | | | Implement some code review fixes for the fix for Bug#27430 unknown2008-05-181-0/+3