summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2009-12-25811-16568/+20121
|\
| * Manual merge of WL#4738 from mysql-next-mr: Alexey Kopytov2009-12-28753-15010/+16202
| |\
| | * my_once.c: clarify the commentSergei Golubchik2009-12-261-2/+3
| | * don't show the value of open_files_limitSergei Golubchik2009-12-262-10/+10
| | * don't show --ssl* option if ssl is not compiled inSergei Golubchik2009-12-256-43/+19
| | * mergedSergei Golubchik2009-12-2417-38/+114
| | |\
| | * | slightly more complete mysqld--help testSergei Golubchik2009-12-243-5/+20
| | * | backport typos foundSergei Golubchik2009-12-231-3/+2
| | * | fixed "engine not found" error in open_binary_frmSergei Golubchik2009-12-233-19/+20
| | * | fix atomic/solaris.h to conformSergei Golubchik2009-12-233-226/+32
| | * | 32-bit fixSergei Golubchik2009-12-221-0/+5
| | * | minimal changes to errmst-utf8.txt (mostly whitespace) to match 6.0-codebase ...Sergei Golubchik2009-12-2214-44/+44
| | * | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-22739-14727/+16071
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2541-245/+1155
| |\ \ \ | | | |/ | | |/|
| * | | Automerge.Alexey Kopytov2009-12-252-50/+50
| |\ \ \
| | * | | Fixed test failures from the 'parts' suite introduced by Alexey Kopytov2009-12-232-50/+50
| * | | | Addendum to the backport patch for WL#2934:Alexey Kopytov2009-12-251-15/+17
| |/ / /
| * | | Fixed more PB2 test failures introduced by backporting WL#2934.Alexey Kopytov2009-12-232-32/+32
| * | | Fixed more PB2 test failures introduced by backporting WL#2934.Alexey Kopytov2009-12-229-319/+316
| * | | Fixed a Windows build failureAlexey Kopytov2009-12-221-1/+1
| * | | Backport of WL #2934: Make/find library for doing float/double Alexey Kopytov2009-12-2258-1159/+3526
* | | | mergeVladislav Vaintroub2009-12-251-4/+15
|\ \ \ \
| * | | | use systemtap on linux if installed, for dtrace functionalityVladislav Vaintroub2009-12-241-4/+15
* | | | | enable Cygwin build againVladislav Vaintroub2009-12-252-1/+6
|/ / / /
* | | | mergeVladislav Vaintroub2009-12-241-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-241-1/+0
| |\ \ \
| | * | | Postfix for Bug#37408 (fix for Bug#49898).Alexander Nozdrin2009-12-241-1/+0
| * | | | Merge default.conf from mysql-trunk.Alexander Nozdrin2009-12-231-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Fix default.conf.Alexander Nozdrin2009-12-231-1/+1
| * | | | Auto-merge (empty) from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-230-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Backporting fix for Bug#49834 from mysql-next-mr-bugfixingAlexander Nozdrin2009-12-231-1/+6
* | | | | recompile partition plugin for embedded server, its behavior depends on WITH_...Vladislav Vaintroub2009-12-231-3/+3
* | | | | mergeVladislav Vaintroub2009-12-231-0/+7
|\ \ \ \ \
| * | | | | restore flaky loadxml test, fix solaris plugin load using -lpthread instead o...Vladislav Vaintroub2009-12-232-3/+7
| * | | | | fix loadxml test, it tries to disconnect without reading results. when EXTRA_...Vladislav Vaintroub2009-12-231-0/+3
* | | | | | mergeVladislav Vaintroub2009-12-232-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-231-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-2310-41/+71
| | |\ \ \
| | * \ \ \ mergeVladislav Vaintroub2009-12-224-1/+42
| | |\ \ \ \
| | * | | | | Fix build error with CMake 2.8 (mysql_stmt_next_result not exported Vladislav Vaintroub2009-12-221-0/+1
| * | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2311-42/+72
| |\ \ \ \ \ \
| | * \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2210-41/+71
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-2229-202/+1077
| | |\ \ \ \ \ \ \
| | * | | | | | | | Force use of c-register in CAS instruction on x86-32 bit architecture, b-regi...Mikael Ronstrom2009-12-211-1/+1
| | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | mergeVladislav Vaintroub2009-12-220-0/+0
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Null-merge default.conf from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-210-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Null-merge default.conf from mysql-trunk.Alexander Nozdrin2009-12-210-0/+0
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Null-merge default.conf from mysql-next-mr.Alexander Nozdrin2009-12-210-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| * | | | | | | | | | Bug#49834 - fixed a bug introduced by mismerge.Vladislav Vaintroub2009-12-221-1/+6
| |/ / / / / / / / /
* | | | | | | | | | mergeVladislav Vaintroub2009-12-2211-41/+72
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |