summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-02-062-3/+3
|\
| * Manual merge from mysql-next-mr.Alexander Nozdrin2010-01-188-183/+398
| |\
| * \ Auto-merge from mysql-trunk-merge.Alexander Nozdrin2009-12-242-3/+3
| |\ \
| | * \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-241-0/+3
| | |\ \
| | | * \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-195-56/+84
| | | |\ \
| | | * \ \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-164-24/+14
| | | |\ \ \
| | | * | | | Backporting patch for Bug#47756Alexander Nozdrin2009-12-151-0/+3
| | * | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-232-3/+3
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Manual merge.Davi Arnaut2009-12-182-3/+3
| | | |\ \ \ \
| | | | * | | | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-172-3/+3
* | | | | | | | Fix AIX error during compile in my_handler (pointer to data is used, while po...Vladislav Vaintroub2010-01-191-1/+5
* | | | | | | | Fix various compiler/OS compatibility errorsVladislav Vaintroub2010-01-191-1/+1
* | | | | | | | Bug#50362:Vladislav Vaintroub2010-01-161-14/+15
* | | | | | | | mergeVladislav Vaintroub2010-01-141-6/+6
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | WL#2360 Performance schemaMarc Alff2010-01-111-6/+6
* | | | | | | | mergeVladislav Vaintroub2010-01-113-5/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | WL#2360 Performance schemaMarc Alff2010-01-063-5/+6
* | | | | | | | mergeVladislav Vaintroub2009-12-254-172/+386
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | my_once.c: clarify the commentSergei Golubchik2009-12-261-2/+3
| * | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-223-170/+383
| |/ / / / / /
* | | | | | | mergeVladislav Vaintroub2009-12-195-57/+84
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-1727-379/+640
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| | | |\ \ \ \ \ \ | | | | | |_|/ / / | | | | |/| | | |
* | | | | | | | | mergeVladislav Vaintroub2009-12-1930-386/+702
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-172-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
| * | | | | | | | | | | | 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
* | | | | | | | | | | | | mergeVladislav Vaintroub2009-12-164-24/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |