Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Automatic merge | Michael Widenius | 2014-02-05 | 49 | -513/+1057 |
|\ | |||||
| * | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 18 | -95/+295 |
| * | Fixes for CREATE_OR_REPLACE | Michael Widenius | 2014-01-31 | 7 | -19/+64 |
| * | Implementation of MDEV-5491: CREATE OR REPLACE TABLE | Michael Widenius | 2014-01-29 | 19 | -307/+569 |
| * | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 26 | -112/+142 |
| * | Increased back_log to 150, but not more than max_connections. | Michael Widenius | 2013-12-27 | 3 | -2/+9 |
* | | merge | Sergei Golubchik | 2014-02-04 | 56 | -569/+1190 |
|\ \ | |||||
| * | | WEIGHT_STRING fix: correct Item_func_weight_string::eq() method | Sergei Golubchik | 2014-02-03 | 1 | -0/+9 |
| * | | mysql 5.6 partitioning bugfix: doubly-reported error | Sergei Golubchik | 2014-02-03 | 1 | -0/+3 |
| * | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 49 | -465/+908 |
| |\ \ | |||||
| | * \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 45 | -375/+619 |
| | |\ \ | |||||
| | | * | | MDEV-5345 - Deadlock between mysql_change_user(), SHOW VARIABLES and | Sergey Vojtovich | 2014-01-28 | 2 | -79/+74 |
| | | * | | merge 5.3 -> 5.5 | Alexander Barkov | 2014-01-28 | 3 | -10/+3 |
| | | |\ \ | |||||
| | | | * | | MDEV-5506 safe_mutex: Trying to lock unitialized mutex at safemalloc.c | Alexander Barkov | 2014-01-28 | 4 | -14/+7 |
| | | * | | | MDEV-5576 ALTER TABLE progress report > 100% | Sergei Golubchik | 2014-01-27 | 1 | -0/+1 |
| | | * | | | MDEV-5461 Assertion `length <= column->length' fails in write_block_record wi... | Sergei Golubchik | 2014-01-26 | 1 | -30/+2 |
| | | * | | | Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNORE | Michael Widenius | 2014-01-26 | 4 | -5/+40 |
| | | * | | | Fixed that setup_natural_join_row_types can safely be called twice | Michael Widenius | 2014-01-26 | 2 | -1/+14 |
| | | * | | | Fixed bug that I accidently introduced in mysql_tzinfo_to_sql | Michael Widenius | 2014-01-26 | 1 | -3/+4 |
| | | * | | | Merge 5.3 -> 5.5 | Alexander Barkov | 2014-01-27 | 4 | -23/+27 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | MDEV-5458 RQG hits 'sql/tztime.cc:799: my_time_t sec_since_epoch(...): | Alexander Barkov | 2014-01-27 | 4 | -23/+26 |
| | | | * | | [Backport to 5.3] | Sergey Petrunya | 2014-01-25 | 1 | -1/+1 |
| | | | * | | MDEV-5504 Server crashes in String::length on SELECT with MONTHNAME, GROUP BY... | Alexander Barkov | 2014-01-24 | 2 | -11/+7 |
| | | | * | | MDEV-5368: Server crashes in Item_in_subselect::optimize on ... | Sergey Petrunya | 2014-01-23 | 1 | -1/+1 |
| | | * | | | merge 5.3->5.5 | unknown | 2014-01-26 | 6 | -39/+14 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | merge of MDEV-5356 5.1->5.3 (with more fixes and test suite). | unknown | 2014-01-23 | 6 | -39/+14 |
| | | | |\ \ | |||||
| | | | | * | | MDEV-5356: Server crashes in Item_equal::contains on 2nd execution of a PS | unknown | 2014-01-23 | 3 | -15/+5 |
| | | | | * | | make 5.1 compiling with modern gcc. | unknown | 2013-12-20 | 1 | -2/+2 |
| | | * | | | | Merge | Sergey Petrunya | 2014-01-24 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | MDEV-5337: Wrong result in mariadb 5.5.32 with ORDER BY + LIMIT when index_co... | Sergey Petrunya | 2014-01-24 | 1 | -1/+1 |
| | | * | | | | | Fixed Mageia Bug 12355: mariadb produces warning messages while loading timez... | Michael Widenius | 2014-01-24 | 1 | -37/+152 |
| | | * | | | | | Fix for MDEV-5531: double call procedure in one session - hard shutdown the s... | Michael Widenius | 2014-01-24 | 9 | -46/+110 |
| | | * | | | | | MDEV-5419 no audit events for warnings converted to errors in the strict mode. | Alexey Botchkov | 2014-01-23 | 2 | -1/+3 |
| | | |/ / / / | |||||
| | | * | | | | Merge | Sergey Petrunya | 2014-01-23 | 1 | -1/+1 |
| | | |\ \ \ \ | |||||
| | | | * | | | | MDEV-5368: Server crashes in Item_in_subselect::optimize on ... | Sergey Petrunya | 2014-01-23 | 1 | -1/+1 |
| | | * | | | | | MDEV-5406 add index to an innodb table with a uniqueness violation crashes my... | Sergei Golubchik | 2014-01-23 | 1 | -8/+29 |
| | | * | | | | | MDEV-5421 Assertion `! is_set()' fails on INSERT IGNORE when a table has no p... | Sergei Golubchik | 2014-01-23 | 3 | -5/+5 |
| | | * | | | | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 14 | -27/+60 |
| | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ | merge 5.1 => 5.5 | Tor Didriksen | 2013-11-01 | 1 | -1/+3 |
| | | | |\ \ \ \ \ | |||||
| | | | | * | | | | | Bug#17617945 BUFFER OVERFLOW IN GET_MERGE_MANY_BUFFS_COST WITH SMALL SORT_BUF... | Tor Didriksen | 2013-11-01 | 1 | -1/+3 |
| | | | * | | | | | | remerge 5.1 => 5.5 | Tor Didriksen | 2013-10-29 | 1 | -2/+4 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | Bug#17326567 MYSQL SERVER FILESORT IMPLEMENTATION HAS A VERY SERIOUS BUG | Tor Didriksen | 2013-10-29 | 1 | -2/+5 |
| | | | * | | | | | | Bug #16051817 GOT ERROR 124 FROM STORAGE ENGINE | Aditya A | 2013-10-21 | 2 | -4/+22 |
| | | | * | | | | | | Bug #17357535 BACKPORT BUG#16241992 TO 5.5 | Anirudh Mangipudi | 2013-10-18 | 1 | -0/+1 |
| | | | * | | | | | | Bug#17559867 AFTER REBUILDING , A MYISAM PARTITION ENDS UP | Aditya A | 2013-10-18 | 1 | -0/+2 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | Bug#17559867 AFTER REBUILDING,A MYISAM PARTITION ENDS UP | Aditya A | 2013-10-18 | 1 | -0/+2 |
| | | | * | | | | | | Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF | Venkatesh Duggirala | 2013-10-16 | 1 | -1/+0 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF | Venkatesh Duggirala | 2013-10-16 | 1 | -1/+0 |
| | | | * | | | | | | Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE | Venkata Sidagam | 2013-10-16 | 1 | -2/+4 |
| | | | |\ \ \ \ \ \ | | | | | |/ / / / / | |||||
| | | | | * | | | | | Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE | Venkata Sidagam | 2013-10-16 | 1 | -2/+4 |