summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-1727-379/+640
|\
| * Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-172-9/+64
| |\
| * \ Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-164-24/+14
| |\ \
| * \ \ Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-112-5/+12
| |\ \ \
| * | | | WL#2360 Performance schemaMarc Alff2009-12-0927-376/+637
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-1/+5
|\ \ \ \ \
| * \ \ \ \ Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-171-1/+5
| |\ \ \ \ \
| | * \ \ \ \ 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
* | | | | | | | Auto-merge from mysql-next-mr-summit0.3.Alexander Nozdrin2009-12-162-9/+64
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge to latest mysql-next-mrMikael Ronstrom2009-12-164-24/+14
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | MergeMikael Ronstrom2009-12-146-20/+120
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merged in WL#5105Mikael Ronstrom2009-11-271-0/+24
| |\ \ \ \ \ \ \
| | * | | | | | | WL#5105, review fixMikael Ronstrom2009-11-201-5/+5
| | * | | | | | | WL#5105, Optimize ptr_cmp on Solaris by using memcmp instead of native ptr_cmpMikael Ronstrom2009-11-201-0/+24
| | |\ \ \ \ \ \ \
| | | * | | | | | | WL#5105, ptr_cmp optimised on Solaris, more efficient to use memcmp on Solari...Mikael Ronstrom2009-09-231-0/+24
| * | | | | | | | | Merge WL#5137 to mysql-next-mrMikael Ronstrom2009-11-271-9/+40
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ WL#5137, Remove hash calculation from LOCK_open in open_tableMikael Ronstrom2009-11-201-9/+40
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Review comments for LOCK_open patchMikael Ronstrom2009-11-101-10/+16
| | | * | | | | | | | A minor change to MySQL's hash where calculation of hash can be done separate...Mikael Ronstrom2009-10-091-2/+27
* | | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-164-55/+79
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | / / / / | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-163-54/+59
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | 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
| * | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-10/+0
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+20
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge from 5.0Staale Smedseng2009-12-061-1/+20
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / | | | |/| | | | | | |
* | | | | | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-10/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-10/+0
| |/ / / / / / / / /
* | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-123-14/+14
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1141-563/+1560
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-011-2/+2
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Move DBG_* macros to after the variable declaration section in aKent Boortz2009-11-251-2/+2
| * | | | | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | 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
| * | | | | | | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-11/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Bug#46043 mysqld --skip-innodb does not skip InnoDBKristofer Pettersson2009-11-091-11/+11
| | |/ / / / / / / / /
* | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-101-3/+45
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-041-3/+45
* | | | | | | | | | | Bug#47756 Setting 2byte collation ID with 'set names' crashes the serverAlexander Barkov2009-12-071-0/+3
* | | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-042-3/+31
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge mysql-next-mr (revno 2927) --> mysql-next-mr-marcMarc Alff2009-12-021-9/+32
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-11-302-3/+31
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
* | | | | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-9/+32
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Manual resolving for the following filesAndrei Elkin2009-12-011-9/+32
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-302-2/+7
| | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |