summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-1612-224/+235
|\
| * Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-123-9/+8
| * Fix use of uninitialized variable.Alexander Nozdrin2010-08-121-1/+1
| * BUG#50312 Warnings for unsafe sub-statement not returned to clientAlfranio Correia2010-08-108-207/+216
| * Bug #55842 CMake: bad dependencies on sql/lex_hash.h Vladislav Vaintroub2010-08-091-0/+2
| * Build cleanupsVladislav Vaintroub2010-08-051-5/+6
| * Bug#55648: Server crash on MIX/MAX on maximum time valueEvgeny Potemkin2010-08-021-2/+2
* | manual merge from mysql-5.1-bugteamJon Olav Hauglid2010-08-093-69/+6
|\ \
| * | Bug #54106 assert in Protocol::end_statement,Jon Olav Hauglid2010-08-093-68/+6
* | | mergeGeorgi Kodinov2010-08-059-29/+29
|\ \ \ | |/ /
| * | Addendum to bug #42144 : fixed a wrong type conversation causing plugin testsGeorgi Kodinov2010-08-051-1/+1
| * | Bug#54568: create view cause Assertion failed: 0, Martin Hansson2010-08-051-1/+1
| * | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-041-4/+4
| * | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-031-2/+2
* | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-0494-3495/+1605
|\ \ \ | | |/ | |/|
| * | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-07-309-314/+277
| * | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2010-07-3073-2167/+1383
| |\ \
| | * | Fix build failure.Alexander Nozdrin2010-07-292-0/+2
| | * | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-2926-123/+155
| | |\ \
| | * \ \ Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-294-12/+31
| | |\ \ \
| | | * | | Bug #55472: Assertion failed in heap_rfirst function of hp_rfirst.c onGleb Shchepa2010-07-291-1/+1
| | | * | | BUG 55387: Automerged bzr bundle from bug report.Luis Soares2010-07-283-11/+30
| | | |\ \ \
| | | | * | | BUG#55387: binlog.binlog_tmp_table crashes the serverLuis Soares2010-07-223-11/+30
| | * | | | | Fix a Windows failure of main.merge test introduced byKonstantin Osipov2010-07-291-2/+2
| | * | | | | Fix a failing assert when running funcs_1.innodb_trig_03 test.Konstantin Osipov2010-07-281-1/+1
| | * | | | | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-2749-1181/+246
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | Implement WL#5502 Remove dead 5.0 class Sensitive_cursor.Konstantin Osipov2010-07-2710-471/+43
| | * | | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-2738-460/+538
| | * | | | | Bug #55498 SHOW CREATE TRIGGER takes wrong type of metadata lockJon Olav Hauglid2010-07-231-14/+24
| | * | | | | Bug #54905 Connection with WRITE lock cannot ALTER table due toJon Olav Hauglid2010-07-221-9/+23
| | * | | | | Bug #55223 assert in Protocol::end_statement during CREATE DATABASEJon Olav Hauglid2010-07-222-71/+9
| | * | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-1954-785/+708
| | |\ \ \ \ \
| | * | | | | | A pre-requisite for patch fixing bug #52044 "FLUSH TABLES Dmitry Lenev2010-07-133-338/+45
| | * | | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-1371-532/+691
| | |\ \ \ \ \ \
| | * | | | | | | Bug #37521 Row inserted through view not always visible in baseJon Olav Hauglid2010-07-071-3/+3
| | * | | | | | | Bug #54401 assert in Diagnostics_area::set_eof_status , HANDLERJon Olav Hauglid2010-07-051-0/+4
| | * | | | | | | Another follow-up for 5.5 version of fix for bug#54360 Dmitry Lenev2010-07-011-47/+27
| | * | | | | | | A follow-up for 5.5 version of fix for bug#54360 "Deadlock Dmitry Lenev2010-07-013-50/+1
| | * | | | | | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATEJon Olav Hauglid2010-07-0120-631/+443
| | * | | | | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-06-3014-338/+675
| | |\ \ \ \ \ \ \
| | * | | | | | | | Salvage comments added by Ingo while working on Konstantin Osipov2010-06-291-1/+5
| | * | | | | | | | A fix for Bug#54811 "Assert in mysql_lock_have_duplicate()".Konstantin Osipov2010-06-293-126/+65
| | * | | | | | | | Merge trunk -> trunk-runtimeKonstantin Osipov2010-06-253-6/+14
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #53757 assert in mysql_truncate_by_deleteJon Olav Hauglid2010-06-251-0/+1
| | * | | | | | | | | Backport from mysql-6.0-codebase of:Jon Olav Hauglid2010-06-232-3/+8
| | * | | | | | | | | A new implementation for the TABLE_SHARE cache in MDLKonstantin Osipov2010-06-184-80/+228
| * | | | | | | | | | Rename select_send::abort() to select_send::abort_result_set()Alexander Nozdrin2010-07-287-20/+20
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Cleanup after bild team push.Vladislav Vaintroub2010-07-252-93/+8
| * | | | | | | | | Add a maintainer target to the warning-mode of the build scripts.Davi Arnaut2010-07-241-1/+2
| * | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQLDavi Arnaut2010-07-241-4/+5