summaryrefslogtreecommitdiff
path: root/mysys/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-9/+21
|\
| * merge with 5.1Sergei Golubchik2010-09-111-4/+0
| |\
| | * Merge with MySQL 5.1.50Michael Widenius2010-08-271-4/+0
| | |\
| | | * Bug#22320: my_atomic-t unit test failsDavi Arnaut2010-07-051-2/+1
| * | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-5/+5
| |/ /
| * | Merge with MySQL 5.1, with following additions:unknown2009-11-161-13/+22
| |\ \ | | |/
| * | Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+1
| |\ \
| * | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de...Michael Widenius2008-12-031-0/+10
| * | | Merged 5.1 maria with 5.1 maria team tree. Automerge.Michael Widenius2008-10-111-6/+5
| |\ \ \
| | * | | Implement conditional building correctly.Sergei Golubchik2008-10-011-6/+5
| * | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | WL#3064 - waiting threads - wait-for graph and deadlock detectionSergei Golubchik2008-07-291-1/+1
| * | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-1/+1
| |\ \ \ \
| * | | | | Added wrapper for chmod(): my_chmod()unknown2008-01-031-1/+1
| * | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-3/+8
| |\ \ \ \ \
| | * | | | | Moved randomize and my_rnd under mysysunknown2007-10-091-0/+1
| | * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-041-1/+1
| | |\ \ \ \ \
| | | * | | | | WL#3072 - Maria recoveryunknown2007-06-261-1/+1
| | * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+6
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/work-maria.bakunknown2007-04-161-1/+2
| | | |\ \ \ \ \
| | | | * | | | | Pagecache integration for review.unknown2007-04-041-1/+2
| | | * | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-2/+5
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-mariaunknown2007-02-021-1/+1
| | | | |\ \ \ \ \
| | | | | * | | | | postreview changes for page cache and pre review commit for loghandlerunknown2007-02-021-1/+1
| | | | * | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-201-2/+5
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-3/+7
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Maria - WL#3134 Key cache to Page cache conversionunknown2006-11-161-55/+0
| | | | | | * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2006-09-201-1/+2
| | | | | | |\ \ \ \ \
| | | | | | | * | | | | amd64 atomic opsunknown2006-08-101-1/+2
| | | | | | * | | | | | Maria, very minor changes.unknown2006-09-201-1/+2
| | | | | | * | | | | | Merge desktop.sanja.is.com.ua:/home/bell/mysql/bk/mysql-mariaunknown2006-08-141-1/+58
| | | | | | |\ \ \ \ \ \ | | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | | | * | | | | The pagae cache added.unknown2006-07-061-1/+57
* | | | | | | | | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-10/+8
* | | | | | | | | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-1/+1
* | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-3/+2
* | | | | | | | | | | | Backport: remove dead code.Davi Arnaut2010-05-281-1/+1
* | | | | | | | | | | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
* | | | | | | | | | | | WL#2373 Use cycle counter for timingMarc Alff2009-11-241-3/+7
* | | | | | | | | | | | WL#3230 concurrent hashMarc Alff2009-11-171-1/+2
* | | | | | | | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge from mysql-5.1.Alexander Nozdrin2009-10-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus BlÄudd2009-10-061-1/+1
| * | | | | | | | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-131-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
* | | | | | | | | | | | | Merge "trunk-build" up into "next-mr".Joerg Bruehe2009-09-301-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-281-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| / / / / / / / / / / / | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Fix bug#46980Joerg Bruehe2009-09-171-2/+10
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
* | | | | | | | | | | | This is the downport ofVladislav Vaintroub2009-09-111-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Auto-mergeIgnacio Galarza2009-07-311-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-1/+1