Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | MDEV-16229 Replication aborts with ER_VIEW_SELECT_TMPTABLE after half-failed ... | Monty | 2018-05-22 | 1 | -1/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -3/+30 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -2/+29 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-8569 build_table_filename() doesn't support temporary tables. | Alexey Botchkov | 2016-07-18 | 1 | -2/+29 |
| * | | | cleanup | Sergei Golubchik | 2016-07-13 | 1 | -1/+1 |
* | | | | MDEV-10216: Assertion `strcmp(share->unique_file_name,filename) || | Nirbhay Choubey | 2016-08-08 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -1/+2 |
|\ \ \ | |/ / | |||||
| * | | MDEV-7370: Server deadlocks on renaming a table for which persistent statisti... | Sergei Petrunia | 2015-11-18 | 1 | -1/+2 |
* | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -1/+1 |
|/ / | |||||
* | | MDEV-5309 - RENAME TABLE does not check for existence of the table's engine | Sergey Vojtovich | 2015-06-16 | 1 | -7/+2 |
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | Implementation of MDEV-5491: CREATE OR REPLACE TABLE | Michael Widenius | 2014-01-29 | 1 | -6/+2 |
* | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -2/+3 |
|\ \ | |||||
| * \ | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -2/+3 |
| | |\ | |||||
| | | * | Bug #14227431: CHARACTER SET MISMATCH WHEN ALTERING FOREIGN KEYS | Sivert Sorumgard | 2013-06-12 | 1 | -2/+2 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+3 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | merge of 2876.430.11 & 2876.430.1 | unknown | 2013-06-27 | 1 | -1/+1 |
| * | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+2 |
* | | | | test_sql_discovery storage engine | Sergei Golubchik | 2013-04-09 | 1 | -5/+8 |
* | | | | remove dd_frm_type(), dd_frm_storage_engine(), dd_check_storage_engine_flag() | Sergei Golubchik | 2013-04-09 | 1 | -52/+41 |
* | | | | revert | Sergei Golubchik | 2013-04-09 | 1 | -8/+8 |
|/ / / | |||||
* | | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -0/+1 |
* | | | Added procedures to delete records by keys from statistical tables. | Igor Babaev | 2012-07-10 | 1 | -0/+6 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ | |||||
| * \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ \ | |||||
* | | \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -1/+2 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -8/+8 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -8/+8 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bugfix: New table creation/renaming block added if old encoded table present. | unknown | 2011-05-11 | 1 | -8/+8 |
| | |/ / | |||||
| * | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| * | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -1/+1 |
* | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -6/+1 |
* | | | | Auto-merge from mysql-5.1-bugteam for bug#47924. | Dmitry Shulga | 2010-11-08 | 1 | -3/+3 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | A fix and a test case for Bug#47924 -main.log_tables times out | Dmitry Shulga | 2010-11-07 | 1 | -3/+3 |
| |/ / | |||||
| * | | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -4/+5 |
* | | | Bug #56595 RENAME TABLE causes assert on OS X | Jon Olav Hauglid | 2010-09-16 | 1 | -0/+1 |
* | | | Followup for Bug #54360 Deadlock DROP/ALTER/CREATE DATABASE | Jon Olav Hauglid | 2010-08-10 | 1 | -2/+0 |
* | | | A fix for Bug#41158 "DROP TABLE holds LOCK_open during unlink()". | Konstantin Osipov | 2010-08-09 | 1 | -14/+5 |
* | | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE | Jon Olav Hauglid | 2010-07-01 | 1 | -5/+5 |