summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-12-2211-41/+72
|\
| * Auto-merge (empty) from mysql-trunk-build.Alexander Nozdrin2009-12-220-0/+0
| |\
| | * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-22144-1205/+4518
| | |\
| * | \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-22208-2408/+6640
| |\ \ \
| * \ \ \ Automerge the changes of version 5.5.0-m2.Joerg Bruehe2009-12-1610-41/+71
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Automerge the build fixes of 5.5.0-m2 back into the tree.Joerg Bruehe2009-12-1610-41/+71
| | |\ \ \
| | | * | | The version is renamed:MySQL Build Team2009-12-071-1/+1
| | | * | | Handle the "semisync" plugin inMySQL Build Team2009-11-262-0/+26
| | | * | | Remove erroneous traces of the InnoDB plugin (that is 5.1 only)MySQL Build Team2009-11-181-10/+2
| | | * | | Change the control structures which the RPM spec file uses to governMySQL Build Team2009-11-171-2/+12
| | | * | | Fix not_partition.test.MySQL Build Team2009-11-172-8/+8
| | | * | | Disable WL#4435.MySQL Build Team2009-11-172-3/+2
| | | * | | Type change: "fk->name" is no "const char *" any more, rather a "LEX_STRING".MySQL Build Team2009-11-171-5/+5
| | | * | | The "hash_*" functions have got a prefix "my_" in 2008.MySQL Build Team2009-11-172-12/+12
| | | * | | In a C file, use C style comments and not C++ style.MySQL Build Team2009-11-161-1/+1
| | | * | | Add missing cleanup, needed for "make distcheck" to succeed.MySQL Build Team2009-11-131-1/+1
| | | * | | Solve a "make" rule issue in the context of dtarce and shared objects:MySQL Build Team2009-11-131-1/+4
* | | | | | mergeVladislav Vaintroub2009-12-2124-182/+1067
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge default.conf from mysql-trunk.Alexander Nozdrin2009-12-211-1/+1
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Fix default.conf.Alexander Nozdrin2009-12-211-1/+1
| * | | | | mergeMattias Jonsson2009-12-212-0/+41
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#48737: Partitions: search fails with ucs2Mattias Jonsson2009-12-212-0/+41
| * | | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-212-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Disable plugin_load.test due to Bug#42144.Alexander Nozdrin2009-12-212-1/+1
| * | | | | Fix inconsistently defined THR_LOCK_myisam_mmapVladislav Vaintroub2009-12-203-10/+10
| * | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-201-3/+5
| |\ \ \ \ \
| * \ \ \ \ \ Auto-merge (empty) from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-200-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Post-merge fix: wait for statement result before disconnecting. Otherwise the...Mikael Ronstrom2009-12-191-1/+3
| * | | | | | Auto-merge (empty) from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-190-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-19124-1165/+3639
| | |\ \ \ \ \
| * | \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-19191-2213/+5568
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mergeVladislav Vaintroub2009-12-1811-22/+117
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Bug #49811: inconsistent usage of SAFEMALLOC in debug compilation on windowsVladislav Vaintroub2009-12-182-10/+0
| | * | | | | | | BUG#49591, Fixed version string in SHOW CREATE TABLE to accomodate for column...Mikael Ronstrom2009-12-179-12/+117
| * | | | | | | | Backport of fix for bug#35020Martin Hansson2009-12-175-138/+224
| * | | | | | | | Merge up to mysql-next-mr-bugfixingJonathan Perkin2009-12-161-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Fix previous merge: 'kill -0' (check PID exists) was changed to 'kill -9',Jonathan Perkin2009-12-161-1/+1
| * | | | | | | | Auto-merge (empty) from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-160-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-16245-1720/+5518
| | |\ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-16242-1726/+5385
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | mergeMattias Jonsson2009-12-162-4/+0
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | post push patch of bug#49369 updating test by removingMattias Jonsson2009-12-162-4/+0
| * | | | | | | | | mergeMattias Jonsson2009-12-154-0/+687
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | merge (and including the fix for bug#48939 since that was not included in mys...Mattias Jonsson2009-12-155-2/+689
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug#49369: No testcase for key caches on partitionsMattias Jonsson2009-12-034-0/+687
| * | | | | | | | | | Null-merge from mysql-trunk-bugfixing (backporting revisions).Alexander Nozdrin2009-12-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Backporing patch for Bug#48351 (Inconsistent library names for semisync plugin)Alexander Nozdrin2009-12-153-12/+12
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Backporting a patch for Bug#49170 (Inconsistent placement of semisyncAlexander Nozdrin2009-12-151-2/+4
| | * | | | | | | | | | Backporting patch for Bug#47756Alexander Nozdrin2009-12-153-0/+16
| * | | | | | | | | | | Fix for bug#46117: This test is replaced by plugin.test also containing a CRE...Horst.Hunger2009-12-112-30/+0