summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* automergeGeorgi Kodinov2009-10-046-14/+35
|\
| * Upmerge 5.0-build -> 5.1-build.Joerg Bruehe2009-09-282-2/+3
| |\
| | * Merge the fix for bug#47137 into 5.0-buildJoerg Bruehe2009-09-281-1/+2
| | |\
| | | * Fix bug#47137Joerg Bruehe2009-09-171-1/+2
| * | | Merge main 5.1 into 5.1-build (a fix from 5.1.39).Joerg Bruehe2009-09-281-0/+1
| |\ \ \
| * | | | Fix bug#46980Joerg Bruehe2009-09-176-13/+33
| * | | | Null-merge a version number change from 5.0 to 5.1Joerg Bruehe2009-09-150-0/+0
| |\ \ \ \
* | \ \ \ \ auto-mergeIngo Struewing2009-10-0258-200/+2865
|\ \ \ \ \ \
| * | | | | | Bug #45677 Slave stops with Duplicate entry for key PRIMARY when using triggerunknown2009-10-016-31/+1455
| * | | | | | Manual merge.Davi Arnaut2009-09-301-23/+19
| |\ \ \ \ \ \
| | * | | | | | Post-merge cleanup: Reorganize code for better comprehensibility.Davi Arnaut2009-09-301-24/+20
| * | | | | | | Manual merge.Davi Arnaut2009-09-306-2/+98
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Post-merge fix: DBUG macros are wrapped inside a loop.Davi Arnaut2009-09-301-1/+7
| | * | | | | | Bug#47525: MySQL crashed (Federated)Davi Arnaut2009-09-305-1/+98
| * | | | | | | Null merge mysql-5.0-bugteam => mysql-5.1-bugteamKristofer Pettersson2009-09-300-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#34895 'show procedure status' or 'show function status' +Kristofer Pettersson2009-09-302-8/+6
| * | | | | | | Merge into mysql-5.1-bugteamJonathan Perkin2009-09-301-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | bug#41546: mysql-stress-run.pl is not packaged on WindowsJonathan Perkin2009-09-301-0/+1
| |/ / / / / / /
| * | | | | | | Merge of Bug#35996Martin Hansson2009-09-3026-90/+433
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Bug #46998 mysqlbinlog can't output BEGIN even if the database is included i...unknown2009-09-305-11/+170
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Bug #46998 mysqlbinlog can't output BEGIN even if the database is included i...unknown2009-09-304-1/+147
| | * | | | | | | auto-mergeTatiana A. Nurnberg2009-09-290-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Null merge mysql-5.0-bugteam => mysql-5.1-bugteamKristofer Pettersson2009-09-290-0/+0
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | autocommitKristofer Pettersson2009-09-29171-1813/+3928
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Bug#42108 Wrong locking for UPDATE with subqueries leads to broken statementKristofer Pettersson2009-09-291-1/+1
| | * | | | | | | | | auto-mergeTatiana A. Nurnberg2009-09-295-6/+9
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | mergingAlexey Botchkov2009-09-292-3/+5
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Don't use the semicolon character as a argument separator as itDavi Arnaut2009-09-292-3/+5
| | | * | | | | | | | | mergingAlexey Botchkov2009-09-293-3/+4
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | mergingAlexey Botchkov2009-09-291093-5516/+268398
| | | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Bug#43733 Select on processlist let the embedded server crash (concurren...Alexey Botchkov2009-06-043-3/+4
| | * | | | | | | | | | auto-mergeTatiana A. Nurnberg2009-09-29167-586/+2301
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s...Tatiana A. Nurnberg2009-09-2818-73/+254
| * | | | | | | | | | | Merge of Bug#35996.Martin Hansson2009-09-2926-121/+771
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Bug#45567: Fast ALTER TABLE broken for enum and setDavi Arnaut2009-09-294-17/+174
| | * | | | | | | | | | mergeMattias Jonsson2009-09-299-31/+271
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#32430: 'show innodb status' causes errorsMattias Jonsson2009-09-259-32/+271
| | | |/ / / / / / / / /
| * | | | | | | | | | | Bug#35996: SELECT + SHOW VIEW should be enough to displayMartin Hansson2009-09-287-29/+437
* | | | | | | | | | | | auto-mergeIngo Struewing2009-10-0125-2/+2846
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-2925-2/+2846
* | | | | | | | | | | | Bug#47150 Assertion in Field_long::val_int() on MERGE + TRIGGER + multi-table...Sergey Glukhov2009-09-293-2/+49
* | | | | | | | | | | | Merge up to mysql-5.1-bugteamJonathan Perkin2009-09-281-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge to mysql-5.0-bugteamJonathan Perkin2009-09-281-0/+24
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | bug#30954: "configure" script in binary distributions considered harmfullJonathan Perkin2009-09-281-0/+24
| | | |_|_|_|_|_|_|_|/ / | | |/| | | | | | | | |
* | | | | | | | | | | | Fixed Sun Studio 8 compilation failures as suggested by Jorgen and reviewedGeorgi Kodinov2009-09-281-2/+4
* | | | | | | | | | | | mergeGeorgi Kodinov2009-09-283-4/+67
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Bug #47106: Crash / segfault on adding EXPLAIN to a non-crashingGeorgi Kodinov2009-09-183-4/+67
| * | | | | | | | | | | Merge bug#42850 to 5.0Magnus Blåudd2009-09-282-4/+5
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ MergeMagnus Blåudd2009-09-281-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge bug#42850 to 5.1Magnus Blåudd2009-09-281-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | |