summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merging.Alexey Botchkov2010-03-013-17/+33
|\
| * Fix WITH_DEBUG problems in CMake build, so people who use configure wrappers ...Vladislav Vaintroub2010-03-021-16/+22
| * Bug#51612 Un initialized locker_lost variable in pfs_instr.ccMarc Alff2010-03-011-1/+1
| * WL#5252: deprecate --optimizer_search_depth=63Roy Lyseng2010-03-011-0/+10
* | Bug#42465 mysqlhotcopy fails with "Table '<y>' was locked with a READ lo...Alexey Botchkov2010-02-281-8/+31
|/
* Merged recent changes from mysql-next-mr-bugfixingDmitry Lenev2010-03-011-1/+1
|\
| * BUG#50296Andrei Elkin2010-03-011-1/+1
* | Merged recent changes from mysql-next-mr-bugfixingDmitry Lenev2010-03-014-7/+24
|\ \ | |/
| * WL#5252: Deprecate --optimizer_search_depth=63Roy Lyseng2010-03-014-7/+24
* | Merge recent changes from mysql-next-mr-bugfixingDmitry Lenev2010-03-019-10/+169
|\ \ | |/
| * local merge before push to mysql-next-mr-bugfixingMarc Alff2010-03-016-4/+113
| |\
| | * Bug#50296 Slave reconnects earlier than the prescribed slave_net_timeout valueMarc Alff2010-03-011-1/+1
| | * merging to 6.0-codebase-bugfixing from a local branchAndrei Elkin2010-02-286-3/+112
| | |\
| | | * bug#50296Andrei Elkin2010-02-282-2/+2
| | | * Bug #50296 Slave reconnects earlier than the prescribed slave_net_timeout valueAndrei Elkin2010-02-286-3/+112
| * | | Bug#51447 performance schema evil twin filesMarc Alff2010-02-263-6/+56
| |/ /
* | | Fix for bug #51105 "MDL deadlock in rqg_mdl_stability testDmitry Lenev2010-02-287-68/+177
* | | WL#5000 FLUSH TABLES|TABLE table_list WITH READ LOCK.Konstantin Osipov2010-02-274-9/+332
|/ /
* | Merged recent changes from mysql-next-mr-bugfixingDmitry Lenev2010-02-261-1/+1
|\ \
| * | Fix truncated GPL text.Jonathan Perkin2010-02-261-1/+1
* | | Merge recent changes from mysql-next-mr intoDmitry Lenev2010-02-261-6/+0
|\ \ \ | |/ /
| * | Bug#41103 6.0 Windows embedded-server tests failAlexey Botchkov2010-02-251-6/+0
* | | Merged recent changes from mysql-next-mr-bugfixing intoDmitry Lenev2010-02-263-13/+33
|\ \ \ | |/ /
| * | Auto-merge from mysql-next-mr.Alexander Nozdrin2010-02-261-0/+4
| |\ \
| | * | Disable rpl_semi_sync on Windows due to Bug 49557.Alexander Nozdrin2010-02-261-0/+4
| * | | mergeVladislav Vaintroub2010-02-260-0/+0
| |\ \ \
| | * \ \ Null-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-02-250-0/+0
| | |\ \ \
| | | * \ \ Null-merge from mysql-trunk.Alexander Nozdrin2010-02-250-0/+0
| | | |\ \ \
| | * | \ \ \ Null-merge from mysql-next-mr.Alexander Nozdrin2010-02-250-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Fix default.conf.Alexander Nozdrin2010-02-251-1/+1
| | | |\ \ \ \ | | |/ / / / / | | | | | _ / | | | | | /
| | | * | | Fix default.conf.Alexander Nozdrin2010-02-251-1/+1
| | | |/ /
| * | | | Bug#51502: building with cmake creates an invalid mysqld_safe.Vladislav Vaintroub2010-02-251-11/+6
| |/ / /
| * | | Workaround crash with dtraced shared libraries under GCC 3.4.6 on 32 bit Sola...Vladislav Vaintroub2010-02-251-2/+23
* | | | Bug #51240 ALTER TABLE of a locked MERGE table failsJon Olav Hauglid2010-02-265-24/+153
* | | | Bug #51336 Assert in reload_acl_and_cache during RESET QUERY CACHEJon Olav Hauglid2010-02-266-0/+41
* | | | Bug #51355 handler stmt cause assertion in Jon Olav Hauglid2010-02-254-0/+107
* | | | merge from mysql-next-mr-bugfixingJon Olav Hauglid2010-02-2535-650/+920
|\ \ \ \ | |/ / /
| * | | On Solaris, overwrite CMake's proposed thread library -lthread with -lpthread. Vladislav Vaintroub2010-02-251-1/+1
| * | | mergeVladislav Vaintroub2010-02-249-583/+598
| |\ \ \
| | * | | Some CMake packaging fixes:Jonathan Perkin2010-02-246-3/+16
| | * | | Update result file for funcs_1.storedproc.Alexander Nozdrin2010-02-241-580/+580
| | * | | Fixed tests for windowsMarc Alff2010-02-242-0/+2
| * | | | #51466 : Source packages are broken with cmake in a cmake-agnostic environmentVladislav Vaintroub2010-02-243-11/+42
| * | | | Fix --with-ssl mappping (--with-ssl=dir should be "yes" or Vladislav Vaintroub2010-02-241-2/+2
| |/ / /
| * | | mergeVladislav Vaintroub2010-02-246-4/+99
| |\ \ \
| | * | | Bug#10143 Perror not showing error descriptionMarc Alff2010-02-236-4/+99
| * | | | Fix typo Vladislav Vaintroub2010-02-241-2/+2
| |/ / /
| * | | mergeVladislav Vaintroub2010-02-2320-53/+366
| |\ \ \
| | * | | Bug#31767 DROP FUNCTION name resolutionMarc Alff2010-02-2314-47/+175
| * | | | Bug#43201: Post-fix. Set thread stack address at the start of each query.Vladislav Vaintroub2010-02-231-0/+1