summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Automerge.Alexey Kopytov2010-07-151-1/+1
|\
| * Manual merge.Alexey Kopytov2010-07-151-1/+1
| |\
| | * Backport of the fix for bug#25421 to 5.0.Alexey Kopytov2010-07-151-0/+3
| * | Null merge.Alexey Kopytov2010-07-150-0/+0
| |\ \ | | |/
| | * Merge the fix for Bug#49238 from SVNVasil Dimov2010-07-071-10/+23
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-142-2/+4
|\ \ \ | |/ /
| * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-07-143-4/+4
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-147-53/+168
|\ \ \ | |/ /
| * | Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-07-146-41/+166
* | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-142-19/+34
|\ \ \ | |/ /
| * | Bug#48327: Some crashes specific to FreeBSD ("embedded")Davi Arnaut2010-07-142-19/+34
* | | mergeGeorgi Kodinov2010-07-144-24/+98
|\ \ \ | |/ /
| * | Bug #51876: crash/memory underrun when loading data with ucs2Georgi Kodinov2010-07-144-24/+98
* | | mergeGeorgi Kodinov2010-07-142-7/+16
|\ \ \ | |/ /
| * | Bug #53493 : add_to_status does not handle the longlong fields in STATUS_VARGeorgi Kodinov2010-07-142-7/+16
* | | mergeGeorgi Kodinov2010-07-142-2/+2
|\ \ \ | |/ /
| * | Bug #54004 : mysql_secure_installation identifies "local host" incorrectlyGeorgi Kodinov2010-07-142-2/+2
* | | mergeGeorgi Kodinov2010-07-143-6/+23
|\ \ \ | |/ /
| * | Bug #52274 : Missing path to mysql in mysql_secure_installationGeorgi Kodinov2010-07-091-1/+19
| * | Use UNINIT_VAR workaround instead of LINT_INIT.Davi Arnaut2010-07-092-5/+4
* | | Add the cmake option MYSQL_MAINTAINER_MODE which is equivalentDavi Arnaut2010-07-123-1/+41
* | | mergeMattias Jonsson2010-07-094-12/+75
|\ \ \ | |/ /
| * | mergeMattias Jonsson2010-07-092-10/+14
| |\ \
| | * | Bug#52517: Regression in ROW level replication performance with partitionsMattias Jonsson2010-07-092-10/+14
| * | | mergeMattias Jonsson2010-07-092-0/+61
| |\ \ \
| | * | | Bug#52455: Subpar INSERT ON DUPLICATE KEY UPDATE performance with many partit...Mattias Jonsson2010-07-092-0/+61
| * | | | Remove AC_LANG_WERROR, it causes trouble earlier versionsDavi Arnaut2010-07-091-2/+0
* | | | | Addendum #3 to bug #53095 : fixed the wrong mysql-trunk tests.Georgi Kodinov2010-07-092-45/+45
* | | | | mergeGeorgi Kodinov2010-07-091-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Addendum #2 to bug #53095 : fixed a bad testcase result.Georgi Kodinov2010-07-091-1/+1
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-0929-187/+182
|\ \ \ \ \ | |/ / / /
| * | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-0919-164/+90
| * | | | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-0911-18/+93
* | | | | 5.1-bugteam->trunk-merge mergeSergey Glukhov2010-07-093-1/+38
|\ \ \ \ \ | |/ / / /
| * | | | Bug#54416 MAX from JOIN with HAVING returning NULL with 5.1 and Empty setSergey Glukhov2010-07-093-1/+38
| |/ / /
* | | | Auto mergeunknown2010-07-081-3/+17
|\ \ \ \ | |/ / /
| * | | Postfix bug#48321unknown2010-07-081-3/+17
* | | | mergeGeorgi Kodinov2010-07-072-1/+6
|\ \ \ \ | |/ / /
| * | | Addendum to the fix for bug #53095 (failing information_schema.test on windows)Georgi Kodinov2010-07-071-1/+5
| * | | Fix what is probably the result of a bad merge. No functional change.Davi Arnaut2010-07-061-0/+1
* | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-061-1/+10
|\ \ \ \ | |/ / /
| * | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-061-1/+10
* | | | Null merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-050-0/+0
|\ \ \ \ | |/ / /
| * | | Bug#22320: my_atomic-t unit test failsDavi Arnaut2010-07-0513-686/+4
* | | | mergeGeorgi Kodinov2010-07-053-3/+60
|\ \ \ \ | |/ / /
| * | | Bug #53613: mysql_upgrade incorrectly revokes TRIGGER privilege on given tableGeorgi Kodinov2010-07-013-3/+59
* | | | mergeGeorgi Kodinov2010-07-053-9/+67
|\ \ \ \ | |/ / /
| * | | Bug #53095: SELECT column_name FROM INFORMATION_SCHEMA.STATISTICS Georgi Kodinov2010-06-253-9/+67
* | | | Manual mergeunknown2010-07-041-1/+1
|\ \ \ \ | |/ / /
| * | | Postfix for bug#48321unknown2010-07-041-1/+1