summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Automatic mergeMichael Widenius2014-02-0549-513/+1057
|\
| * Replication changes for CREATE OR REPLACE TABLEMichael Widenius2014-02-0518-95/+295
| * Fixes for CREATE_OR_REPLACEMichael Widenius2014-01-317-19/+64
| * Implementation of MDEV-5491: CREATE OR REPLACE TABLEMichael Widenius2014-01-2919-307/+569
| * Fixes to get valgrind to work with jemallocMichael Widenius2014-01-0226-112/+142
| * Increased back_log to 150, but not more than max_connections.Michael Widenius2013-12-273-2/+9
* | mergeSergei Golubchik2014-02-0456-569/+1190
|\ \
| * | WEIGHT_STRING fix: correct Item_func_weight_string::eq() methodSergei Golubchik2014-02-031-0/+9
| * | mysql 5.6 partitioning bugfix: doubly-reported errorSergei Golubchik2014-02-031-0/+3
| * | 10.0-base mergeSergei Golubchik2014-02-0349-465/+908
| |\ \
| | * \ 5.5 mergeSergei Golubchik2014-02-0145-375/+619
| | |\ \
| | | * | MDEV-5345 - Deadlock between mysql_change_user(), SHOW VARIABLES andSergey Vojtovich2014-01-282-79/+74
| | | * | merge 5.3 -> 5.5Alexander Barkov2014-01-283-10/+3
| | | |\ \
| | | | * | MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.cAlexander Barkov2014-01-284-14/+7
| | | * | | MDEV-5576 ALTER TABLE progress report > 100%Sergei Golubchik2014-01-271-0/+1
| | | * | | MDEV-5461 Assertion `length <= column->length' fails in write_block_record wi...Sergei Golubchik2014-01-261-30/+2
| | | * | | Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNOREMichael Widenius2014-01-264-5/+40
| | | * | | Fixed that setup_natural_join_row_types can safely be called twiceMichael Widenius2014-01-262-1/+14
| | | * | | Fixed bug that I accidently introduced in mysql_tzinfo_to_sqlMichael Widenius2014-01-261-3/+4
| | | * | | Merge 5.3 -> 5.5Alexander Barkov2014-01-274-23/+27
| | | |\ \ \ | | | | |/ /
| | | | * | MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(...):Alexander Barkov2014-01-274-23/+26
| | | | * | [Backport to 5.3]Sergey Petrunya2014-01-251-1/+1
| | | | * | MDEV-5504 Server crashes in String::length on SELECT with MONTHNAME, GROUP BY...Alexander Barkov2014-01-242-11/+7
| | | | * | MDEV-5368: Server crashes in Item_in_subselect::optimize on ...Sergey Petrunya2014-01-231-1/+1
| | | * | | merge 5.3->5.5unknown2014-01-266-39/+14
| | | |\ \ \ | | | | |/ /
| | | | * | merge of MDEV-5356 5.1->5.3 (with more fixes and test suite).unknown2014-01-236-39/+14
| | | | |\ \
| | | | | * | MDEV-5356: Server crashes in Item_equal::contains on 2nd execution of a PSunknown2014-01-233-15/+5
| | | | | * | make 5.1 compiling with modern gcc.unknown2013-12-201-2/+2
| | | * | | | MergeSergey Petrunya2014-01-241-1/+1
| | | |\ \ \ \
| | | | * | | | MDEV-5337: Wrong result in mariadb 5.5.32 with ORDER BY + LIMIT when index_co...Sergey Petrunya2014-01-241-1/+1
| | | * | | | | Fixed Mageia Bug 12355: mariadb produces warning messages while loading timez...Michael Widenius2014-01-241-37/+152
| | | * | | | | Fix for MDEV-5531: double call procedure in one session - hard shutdown the s...Michael Widenius2014-01-249-46/+110
| | | * | | | | MDEV-5419 no audit events for warnings converted to errors in the strict mode.Alexey Botchkov2014-01-232-1/+3
| | | |/ / / /
| | | * | | | MergeSergey Petrunya2014-01-231-1/+1
| | | |\ \ \ \
| | | | * | | | MDEV-5368: Server crashes in Item_in_subselect::optimize on ...Sergey Petrunya2014-01-231-1/+1
| | | * | | | | MDEV-5406 add index to an innodb table with a uniqueness violation crashes my...Sergei Golubchik2014-01-231-8/+29
| | | * | | | | MDEV-5421 Assertion `! is_set()' fails on INSERT IGNORE when a table has no p...Sergei Golubchik2014-01-233-5/+5
| | | * | | | | MySQL-5.5.35 mergeSergei Golubchik2014-01-2214-27/+60
| | | |\ \ \ \ \
| | | | * \ \ \ \ merge 5.1 => 5.5Tor Didriksen2013-11-011-1/+3
| | | | |\ \ \ \ \
| | | | | * | | | | Bug#17617945 BUFFER OVERFLOW IN GET_MERGE_MANY_BUFFS_COST WITH SMALL SORT_BUF...Tor Didriksen2013-11-011-1/+3
| | | | * | | | | | remerge 5.1 => 5.5Tor Didriksen2013-10-291-2/+4
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Bug#17326567 MYSQL SERVER FILESORT IMPLEMENTATION HAS A VERY SERIOUS BUGTor Didriksen2013-10-291-2/+5
| | | | * | | | | | Bug #16051817 GOT ERROR 124 FROM STORAGE ENGINE Aditya A2013-10-212-4/+22
| | | | * | | | | | Bug #17357535 BACKPORT BUG#16241992 TO 5.5Anirudh Mangipudi2013-10-181-0/+1
| | | | * | | | | | Bug#17559867 AFTER REBUILDING , A MYISAM PARTITION ENDS UP Aditya A2013-10-181-0/+2
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Bug#17559867 AFTER REBUILDING,A MYISAM PARTITION ENDS UP Aditya A2013-10-181-0/+2
| | | | * | | | | | Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IFVenkatesh Duggirala2013-10-161-1/+0
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IFVenkatesh Duggirala2013-10-161-1/+0
| | | | * | | | | | Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETEVenkata Sidagam2013-10-161-2/+4
| | | | |\ \ \ \ \ \ | | | | | |/ / / / /
| | | | | * | | | | Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETEVenkata Sidagam2013-10-161-2/+4