summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* MDEV-5244: Make extended_keys=ON by default in 10.0Sergey Petrunya2014-02-251-0/+1
* Backport from 10.0 to 10.0-base the following:Sergey Petrunya2014-02-121-11/+29
* Fixed bug mdev-5630.Igor Babaev2014-02-111-0/+5
* MDEV-4937: sql_slave_skip_counter does not work with GTIDunknown2014-02-114-1/+30
* Merge of MDEV-4984, MDEV-4726, and MDEV-5636 into 10.0-base.unknown2014-02-1018-48/+808
|\
| * MDEV-5636: Deadlock in RESET MASTERunknown2014-02-092-12/+24
| * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-082-201/+242
| * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-081-5/+5
| * MDEV-4984: Implement MASTER_GTID_WAIT() and @@LAST_GTID.unknown2014-02-0717-36/+743
* | MDEV-5509: Seconds_behind_master incorrect in parallel replicationunknown2014-01-085-13/+63
* | merge 5.5->10.0-baseunknown2014-02-051-1/+1
|\ \
| * \ merge of MDEV-5369 (5.3->5.5)unknown2014-01-291-1/+1
| |\ \
| | * | MDEV-5369: Wrong result (0 instead of NULL) on 2nd execution of PS with LEFT ...unknown2014-01-281-1/+1
* | | | 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
| | |\ \ \ \ \ | | | |/ / / /