summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* mergedSergei Golubchik2010-03-159-60/+100
|\
| * Automerge MySQL 5.1.44 merge into latest MariaDB trunk.unknown2010-03-108-59/+96
| |\
| | * Merge MySQL 5.1.44 into MariaDB.unknown2010-03-048-59/+96
| | |\
| | | * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-0/+9
| | | * Manual merge.Davi Arnaut2009-12-182-3/+3
| | | |\
| | | | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-172-3/+3
| | | * | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-171-1/+5
| | | |\ \ | | | | |/
| | | | * Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-171-1/+5
| | | * | Bug#49134 5.1 server segfaults with 2byte collation fileAlexander Barkov2009-12-151-1/+2
| | | * | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-123-53/+57
| | | * | Merge from 5.0Staale Smedseng2009-12-061-1/+20
| | | |\ \ | | | | |/
| * | | | Added count of my_sync calls (to SHOW STATUS)Michael Widenius2010-03-091-0/+3
| |/ / /
* | | | merge 5.1->5.2unknown2010-02-014-14/+10
|\ \ \ \ | |/ / /
| * | | Patch set contributed by Alex Budovski (MCA)Michael Widenius2010-01-291-1/+1
| * | | Merge with fixes for compiler warnings and 2 fixed test casesMichael Widenius2010-01-281-1/+1
| * | | Merge with MySQL 5.1.42Michael Widenius2010-01-152-10/+4
| |\ \ \ | | |/ /
| | * | Move DBG_* macros to after the variable declaration section in aKent Boortz2009-11-251-2/+2
| | * | Additional fix for bug #45613: handle failures from my_hash_insertGeorgi Kodinov2009-11-231-1/+0
| | * | mergeKristofer Pettersson2009-11-201-0/+1
| | |\ \
| | | * | Bug#45613 handle failures from my_hash_insertKristofer Pettersson2009-11-201-0/+1
| | * | | mergeGeorgi Kodinov2009-11-201-1/+1
| | |\ \ \
| | * | | | Bug#46043 mysqld --skip-innodb does not skip InnoDBKristofer Pettersson2009-11-091-11/+11
| * | | | | Removed compiler warningsMichael Widenius2010-01-061-2/+4
* | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-062-78/+75
* | | | | | Merge bug fixes from 5.1Michael Widenius2010-01-041-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fixed bug in my_uuid() that caused failures on hpux and ia64 Michael Widenius2010-01-041-1/+1
* | | | | | merge 5.1-> 5.2unknown2009-12-0820-168/+205
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.unknown2009-11-3014-123/+175
| |\ \ \ \ \
| | * | | | | Added more general support for sorting 2 characters as one (contractions)Michael Widenius2009-11-301-0/+4
| | * | | | | Merge the last bit of MySQL 5.1.41 into MariaDB.unknown2009-11-181-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Use C comments in C codeunknown2009-11-051-1/+1
| | | |/ / /
| | * | | | Merge with MySQL 5.1, with following additions:unknown2009-11-1613-123/+171
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug#46586: When using the plugin interface the type "set" for options caused ...Tatiana A. Nurnberg2009-10-272-2/+7
| | | |/ /
| | | * | Upmerge a Windows compile fix from 5.0 to 5.1.Joerg Bruehe2009-10-161-1/+1
| | | |\ \ | | | | |/
| | | | * Compile fix for Windows:Joerg Bruehe2009-10-161-1/+1
| | | * | Upmerge (automerge) into 5.1Joerg Bruehe2009-10-091-0/+4
| | | |\ \ | | | | |/
| | | | * Fix bug#47923 New "mf_keycache.c" requires thread supportJoerg Bruehe2009-10-081-0/+4
| | | | * Bug#47768 pthread_cond_timedwait() is broken on windowsKristofer Pettersson2009-10-061-1/+1
| | | | * Merge bug#42850 to 5.0Magnus Blåudd2009-09-281-3/+4
| | | | |\
| | | * | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus Blåudd2009-10-063-47/+2
| | | * | | AutomergKristofer Pettersson2009-10-064-4/+41
| | | |\ \ \
| | | | * \ \ automergeGeorgi Kodinov2009-10-041-2/+10
| | | | |\ \ \
| | | | | * | | Fix bug#46980Joerg Bruehe2009-09-171-2/+10
| | | | * | | | auto-mergeIngo Struewing2009-10-012-0/+30
| | | | |\ \ \ \ | | | |/ / / / /
| | | | * | | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-292-0/+30
| | | * | | | | Merge bug#42850 to 5.1Magnus Blåudd2009-09-281-3/+4
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge bug#42850 to 5.0Magnus Blåudd2009-09-281-3/+4
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | / | | | | | | |/ | | | | | |/|
| | | | | * | Bug#42850 race condition in my_thr_init.cMagnus Blåudd2009-09-241-3/+4
| | | | * | | fixed compilation warningsGeorgi Kodinov2009-09-241-1/+1
| | | * | | | Automerge.Alexey Kopytov2009-09-181-1/+1
| | | |\ \ \ \