summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-5.1.Alexander Nozdrin2009-11-0526-124/+374
|\
| * mergeGeorgi Kodinov2009-10-304-3/+45
| |\
| | * Bug #48291 : crash with row() operator,select into @var, and Georgi Kodinov2009-10-304-3/+45
| * | mergeGeorgi Kodinov2009-10-306-102/+99
| |\ \ | | |/
| | * Bug #48293: crash with procedure analyse, view with > 10 columns,Georgi Kodinov2009-10-306-102/+99
| * | mergeGeorgi Kodinov2009-10-303-0/+111
| |\ \ | | |/
| | * Bug #42116 : Mysql crash on specific queryGeorgi Kodinov2009-10-293-0/+109
| * | Bug #46828 rpl_get_master_version_and_clock fails on PB-2unknown2009-10-293-2/+7
| * | A patch and a test case for Konstantin Osipov2009-10-284-2/+64
| * | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-10-282-4/+4
| |\ \ | | |/
| | * Bug#41049 does syntax "grant" case insensitive?Sergey Glukhov2009-10-282-4/+4
| * | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...unknown2009-10-281-5/+7
| * | Merge 5.1-bugteam -> 5.1-bugteam-local.Sergey Vojtovich2009-10-276-7/+37
| |\ \
| | * | A follow-up to fix forSergey Vojtovich2009-10-276-7/+37
* | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-0555-298/+854
|\ \ \ \ | |/ / /
| * | | auto-mergeTatiana A. Nurnberg2009-10-2713-85/+196
| |\ \ \
| | * \ \ mergeGeorgi Kodinov2009-10-271-59/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | merge from 4.1Georgi Kodinov2009-10-271-59/+2
| | | |\ \
| | | | * | Bug #47320: OpenSSL client does not check YaSSL server certificateGeorgi Kodinov2009-10-201-51/+2
| | | | * | Minor clean up in build system; make BUILD/compile-pentium-debug work withTimothy Smith2008-12-0110-11087/+39
| | | | * | Bug #27294: crash with innodb_locks_unsafe_for_binlog=1Timothy Smith2008-12-011-1/+8
| | | | * | Raise version number after cloning 4.1.25unknown2008-11-271-2/+2
| | | | * | Bug#32167 another privilege bypass with DATA/INDEX DIRECTORY.Alexey Botchkov2008-07-2613-56/+114
| | | | * | update from bk repositoryDaniel Fischer2008-06-1134-329/+634
| | | | |\ \
| | * | | \ \ null mergeSergey Glukhov2009-10-270-0/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | automergeSergey Glukhov2009-10-271-2/+2
| | | |\ \ \ \
| | * | \ \ \ \ automergeSergey Glukhov2009-10-274-25/+57
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-10-2712-26/+194
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Bug#41049 does syntax "grant" case insensitive?Sergey Glukhov2009-10-2711-24/+192
| * | | | | | | Bug#46586: When using the plugin interface the type "set" for options caused ...Tatiana A. Nurnberg2009-10-273-4/+11
| | |_|/ / / / | |/| | | | |
| * | | | | | auto-mergeTatiana A. Nurnberg2009-10-27220-2948/+5075
| |\ \ \ \ \ \
| | * \ \ \ \ \ Null merge an addition to fix for BUG#41597.Sergey Vojtovich2009-10-270-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | / / / | | | | |/ / / | | | |/| | |
| | | * | | | An addition to fix forSergey Vojtovich2009-10-271-2/+2
| | | |/ / /
| | * | | | rpl_cross_version made experimental because of bug #43913Georgi Kodinov2009-10-261-0/+1
| | * | | | Bug #47788: Crash in TABLE_LIST::hide_view_error on Georgi Kodinov2009-10-193-0/+43
| | * | | | Bug #47412: Valgrind warnings / user can read uninitalized memory using Georgi Kodinov2009-10-263-14/+125
| | * | | | automergeGeorgi Kodinov2009-10-243-2/+35
| | |\ \ \ \ | | | |/ / /
| | | * | | Bug #47780: crash when comparing GIS items from subqueryGeorgi Kodinov2009-10-213-2/+35
| | * | | | Auto-merge.Ramil Kalimullin2009-10-233-0/+81
| | |\ \ \ \ | | | |/ / /
| | | * | | Fix for bug#48258: Assertion failed when using a spatial indexRamil Kalimullin2009-10-233-0/+81
| | * | | | automergeJon Olav Hauglid2009-10-233-0/+31
| | |\ \ \ \
| | | * | | | Bug #47919 assert in open_table during ALTER temporary tableJon Olav Hauglid2009-10-233-0/+31
| | * | | | | Revert the fix for bug #47627 as it's causing the regression tests in pb2 toGeorgi Kodinov2009-10-233-137/+15
| | * | | | | merged 5.1-main-> 5.1-bugteamGeorgi Kodinov2009-10-2313-37/+129
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | merge from 5.1-mtrBjorn Munch2009-10-2113-37/+129
| | | |\ \ \ \
| | * | | | | | Bug#46640: output from mysqlbinlog command in 5.1 breaks replicationunknown2009-10-232-2/+2
| | * | | | | | BUG#34582: mysql-5.1-bugteam-bug-branch --> mysql-5.1-bugteam-latestLuis Soares2009-10-233-3/+169
| | |\ \ \ \ \ \
| | | * | | | | | BUG#34582: FLUSH LOGS does not close and reopen the binlog indexLuis Soares2009-10-203-3/+169
| | * | | | | | | Post-fix for BUG#47287.Alfranio Correia2009-10-221-1/+0
| | * | | | | | | AutopushRamil Kalimullin2009-10-223-1/+46
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |