summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
* | 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
|\ \ \
| * | | Use C comments in C codeunknown2009-11-051-1/+1
* | | | Bug#46043 mysqld --skip-innodb does not skip InnoDBKristofer Pettersson2009-11-091-11/+11
|/ / /
* | | 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
|\ \ \ \
| * | | | Bug #43606: 4GB Limit on huge_pages shared memory set-upAlexey Kopytov2009-09-181-1/+1
* | | | | Merge from 5.0Staale Smedseng2009-09-171-7/+2
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-5/+2
* | | | | Bug#17332 - changing key_buffer_size on a running serverIngo Struewing2009-09-091-52/+96
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Bug#17332 - changing key_buffer_size on a running serverIngo Struewing2009-09-072-495/+2181
* | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-09-031-0/+7
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Fix for BUG#46591 - .frm file isn't sync'd with sync_frm enabled for Satya B2009-09-031-0/+7
| |/
| * mergeGeorgi Kodinov2009-09-022-7/+11
| |\
* | \ Manual merge.Davi Arnaut2009-09-021-7/+10
|\ \ \ | | |/ | |/|
| * | Post-merge fix. Observe C declaration placement rules.Davi Arnaut2009-09-021-7/+9
| |/
* | Fixed win32 compilation warningsGeorgi Kodinov2009-09-021-0/+2
* | merging bugfix from 5.0Anurag Shekhar2009-08-311-4/+7
|\ \ | |/
| * merging with changes in bugteam branch.Anurag Shekhar2009-08-315-8/+9
| |\
| * | Bug #44723 Larger read_buffer_size values can cause performance Anurag Shekhar2009-08-241-4/+7
* | | Merge from 5.0 for 43414Staale Smedseng2009-08-285-8/+9
|\ \ \ | | |/ | |/|
| * | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-285-8/+9
| |/
* | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-281-1/+1
* | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-1/+1
|\ \