summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-next-mr.Alexander Nozdrin2009-10-088-111/+117
|\
| * Merge from mysq-next-mr-wtf.Alexander Nozdrin2009-10-027-111/+114
| |\
| | * backport of Vladislav Vaintroub2009-09-303-8/+14
| | * Backport of this changeset Vladislav Vaintroub2009-09-303-76/+101
| | * Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-2/+0
| | * Backport of the patch Vladislav Vaintroub2009-09-301-0/+2
| | * Windows improvements : manual backport of Vladislav Vaintroub2009-09-302-28/+0
| * | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-301-0/+3
| |/
* | 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
* | | merge mysql-next-mr-alikVladislav Vaintroub2009-09-243-16/+14
|\ \ \
| * \ \ Merge mysql-next-mr (revno 2880) --> mysql-trunk-signalMarc Alff2009-09-201-52/+96
| |\ \ \ | | |/ /
| * | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-177-13/+29
| |\ \ \
| * | | | WL#2110 (SIGNAL)Marc Alff2009-09-103-16/+14
* | | | | mergeVladislav Vaintroub2009-09-231-0/+8
|\ \ \ \ \
| * | | | | fix compile error. definition of VOID in trunk still conflicts with windows h...Vladislav Vaintroub2009-09-131-0/+8
* | | | | | mergeVladislav Vaintroub2009-09-238-65/+125
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Merge 5.1-bugteam -> trunk-alik.Alexander Nozdrin2009-09-171-52/+96
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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 from mysql-5.1-bugteam.Alexander Nozdrin2009-09-167-13/+29
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | 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
* | | | DownportVladislav Vaintroub2009-09-111-1/+91
* | | | This is the downport ofVladislav Vaintroub2009-09-1123-398/+1161
|/ / /
* | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-123-9/+10
|\ \ \ | |/ /
| * | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-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
| * | | merging with mysql-5.1-bugteam branchSatya B2009-07-271-7/+7
| |\ \ \
| | * \ \ merging with mysql-5.0-bugteamV Narayanan2009-07-171-7/+7
| | |\ \ \ | | | |/ /
| | | * | Bug#43572 Handle failures from hash_initV Narayanan2009-07-121-6/+7
| * | | | merge 5.0-bugteam to 5.1-bugteamSatya B2009-07-241-1/+2
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
* | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-046-17/+51
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-142-9/+42
| |\ \ \ | | |/ /
| | * | AutomergeKristofer Pettersson2009-06-251-2/+13
| | |\ \
| | | * | Bug#45336 --enable-foobar doesn't work for any plugin foobar.Kristofer Pettersson2009-06-251-2/+13
| | * | | Bug#43572 Handle failures from hash_initV Narayanan2009-06-221-1/+1
| | |/ /
| | * | merging with mysql-5.0-bugteamV Narayanan2009-06-191-7/+29
| | |\ \ | | | |/