summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-05457-8775/+19008
|\
| * Fixed a use of non-initialised variable, cannot use NULL flags if RANGE == NO...Mikael Ronstrom2009-11-041-1/+1
| * MergeMikael Ronstrom2009-11-03310-3185/+8475
| |\
| | * Fix default.conf.Alexander Nozdrin2009-11-031-1/+1
| | * Merging a postfix for Bug#46633 Obsolete Serbian localeAlexander Barkov2009-11-023-16/+83
| | |\
| | | * A postfix for Bug#46633 Obsolete Serbian locale nameAlexander Barkov2009-10-293-16/+83
| | * | Backport a patch from 6.0:Alexander Nozdrin2009-11-022-2/+2
| | * | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-02146-4050/+4747
| | |\ \
| | * | | post commit fix: missing result file.Kristofer Pettersson2009-10-291-0/+14
| | * | | Bug#38551 query cache can still consume [very little] cpu time even when it i...Kristofer Pettersson2009-10-297-24/+124
| | * | | Fix automerge: s/hash_search/my_hash_search/.Alexander Nozdrin2009-10-282-4/+4
| | * | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-28331-2542/+15751
| | |\ \ \
| | * | | | Test postfix for Bug#43138 (DROP DATABASE failure does notAlexander Nozdrin2009-10-272-6/+0
| | * | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-23497-19317/+23009
| | |\ \ \ \
| | * | | | | Adding forgotten files for test case for Bug#43138.Alexander Nozdrin2009-10-222-0/+62
| | * | | | | Fix build failure on Linux.Alexander Nozdrin2009-10-221-0/+1
| | * | | | | Automerge from mysql-next-mr-runtime.Alexander Nozdrin2009-10-2247-328/+2899
| | |\ \ \ \ \
| | | * \ \ \ \ Merge with next-mr-runtime.Konstantin Osipov2009-10-2229-243/+833
| | | |\ \ \ \ \
| | | * | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-2247-328/+2899
| | * | | | | | | Backporting a patch for Bug#43138. That patch had been already backportedAlexander Nozdrin2009-10-224-1/+42
| | * | | | | | | Backporting patches for Bug#38347 (ALTER ROUTINE privilegeAlexander Nozdrin2009-10-225-10/+1067
| | | |/ / / / / | | |/| | | | |
| | * | | | | | Bug#27145 EXTRA_ACL troublesKristofer Pettersson2009-10-201-0/+1
| | * | | | | | AutomergeKristofer Pettersson2009-10-19304-3470/+4690
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Pull from mysql-next-mr-runtime.Alexander Nozdrin2009-10-1627-1113/+282
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Backport of:Konstantin Osipov2009-10-169-40/+92
| | | | * | | | | Backport of:Konstantin Osipov2009-10-164-38/+45
| | | | * | | | | Backport of 2617.65.4 from 6.0-codebase.Konstantin Osipov2009-10-166-16/+85
| | | | * | | | | Merge with next-mr-runtimeKonstantin Osipov2009-10-162-25/+25
| | | | |\ \ \ \ \
| | | | | * | | | | Fix a windows build failure (next-mr-runtime).Konstantin Osipov2009-10-162-25/+25
| | | | * | | | | | Merge with next-mr-runtimeKonstantin Osipov2009-10-1611-61/+182
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | * | | | | | Backport of:Konstantin Osipov2009-10-164-54/+4
| | | | * | | | | | Backport of:Konstantin Osipov2009-10-165-635/+30
| | | | * | | | | | Backport of:Konstantin Osipov2009-10-163-305/+1
| | | * | | | | | | Backporting a patch for Bug#47421 from 6.0:Alexander Nozdrin2009-10-161-4/+4
| | | * | | | | | | Backporting revision from 6.0:Alexander Nozdrin2009-10-161-1/+11
| | | * | | | | | | Backporting patch for Bug#38992 from 6.0.Alexander Nozdrin2009-10-161-0/+19
| | | * | | | | | | A backporting patch for the following revision from 6.0:Alexander Nozdrin2009-10-153-0/+44
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Adding funcs_1 into "make test"Alexander Nozdrin2009-10-151-1/+2
| | | * | | | | | Bug #43054 Assertion `!table->auto_increment_field_not_null' failed when ...Magne Mahre2009-10-153-0/+88
| | | * | | | | | Bug #38124 (clean-up patch)Magne Mahre2009-10-151-1/+1
| | | * | | | | | Bug #37433 Deadlock between open_table, close_open_tables, Magne Mahre2009-10-154-0/+21
| | | * | | | | | Bug #38124 "general_log_file" variable silently unset when using expressionMagne Mahre2009-10-153-60/+71
| | | |/ / / / /
| | | * | | | | Backport of:Konstantin Osipov2009-10-1444-578/+561
| | | * | | | | Backport of:Konstantin Osipov2009-10-141-10/+11
| | | * | | | | Backport of:Konstantin Osipov2009-10-141-1/+1
| | | * | | | | Backport of revno: 2617.81.4Jon Olav Hauglid2009-10-143-0/+63
| | | * | | | | Backport of:Konstantin Osipov2009-10-141-4/+0
| | | * | | | | Backport of:Konstantin Osipov2009-10-1420-131/+120
| | | * | | | | ----------------------------------------------------------Konstantin Osipov2009-10-141-0/+19
| | | * | | | | Backport of:Konstantin Osipov2009-10-132-8/+5