summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* Storage engines tests: ALTER ONLINE works differently for MERGE in 10.0Elena Stepanova2014-12-051-22/+60
* 5.5 mergeSergei Golubchik2014-11-192-2/+44
|\
| * Re-enabling tests disabled due to MDEV-5266 and MySQL:65225 (fixed now)Elena Stepanova2014-11-172-2/+44
* | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | 5.5 mergeSergei Golubchik2014-05-093-0/+20
|\ \ | |/
| * rename handler::ha_set_lock_type() -> handler::set_lock_type(),Sergei Golubchik2014-04-282-3/+3
| * MDEV-6139: UPDATE w/ join against MRG_MyISAM table with read-only sub-table f...unknown2014-04-282-0/+19
| * mysql-5.5.37 selective mergeSergei Golubchik2014-03-271-0/+1
| |\
| | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
* | | 10.0-base mergeSergei Golubchik2014-02-2613-13/+26
|\ \ \
| * \ \ 5.5 mergeSergei Golubchik2014-02-2513-13/+26
| |\ \ \ | | |/ /
| | * | MySQL-5.5.36 mergeSergei Golubchik2014-02-1713-13/+26
| | |\ \ | | | |/
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-0613-13/+26
* | | | Intentional change in loggingElena Stepanova2014-02-051-1/+1
* | | | MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-1/+1
* | | | 10.0-base mergeSergei Golubchik2013-12-161-19/+24
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-12-152-20/+25
| |\ \ \ | | |/ /
| | * | 5.3 mergeSergei Golubchik2013-12-131-19/+24
| | |\ \
| | | * \ 5.2 mergeSergei Golubchik2013-12-021-19/+24
| | | |\ \
| | | | * \ 5.1 mergeSergei Golubchik2013-12-011-19/+24
| | | | |\ \
| | | | | * | MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is br...Sergei Golubchik2013-11-291-19/+24
| | * | | | | A fix for MySQL#65146 introduced a new warning.Elena Stepanova2013-11-281-1/+1
* | | | | | | Various changes coming from 5.6Elena Stepanova2013-11-081-3/+3
* | | | | | | Some system tables have InnoDB engineElena Stepanova2013-11-081-0/+25
* | | | | | | Semantics of ALTER ONLINE changed to mirror ALTER .. LOCK=NONEElena Stepanova2013-11-081-1/+1
* | | | | | | More comprehensive error messages and codesElena Stepanova2013-11-088-20/+22
* | | | | | | Merge 10.0-base to 10.0unknown2013-11-077-13/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | .frm file is intact, so the absence of the error message seems Elena Stepanova2013-11-071-3/+1
| * | | | | | More verbose error messagesElena Stepanova2013-11-076-10/+10
* | | | | | | MDEV-5042 - Server crashes when accessing incorrect MERGE table from triggerSergey Vojtovich2013-10-141-2/+6
* | | | | | | 10.0-base merge.Sergei Golubchik2013-09-212-40/+40
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | merge 5.5 -> 10.0-baseunknown2013-08-202-40/+40
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Deliberate change in behavior introduced along with the fix for MDEV-4310Elena Stepanova2013-08-052-40/+40
* | | | | | | 10.0-monty mergeSergei Golubchik2013-07-214-27/+61
|\ \ \ \ \ \ \
| * | | | | | | Fix compile error on Windows.Vladislav Vaintroub2013-07-131-3/+2
| * | | | | | | fix merge.test: online alter table support for MERGE tables, reallySergei Golubchik2013-07-113-13/+43
| * | | | | | | fix for alter_table_online test.Sergei Golubchik2013-07-102-6/+8
| * | | | | | | Fixed issues with partitions and create temporary table SELECT ...Michael Widenius2013-07-031-1/+1
| * | | | | | | mdl_sync now works.Michael Widenius2013-07-021-3/+1
| * | | | | | | merge of 2876.430.11 & 2876.430.1unknown2013-06-271-0/+5
| * | | | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+1
* | | | | | | | 10.0-base mergeSergei Golubchik2013-07-1815-15/+15
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | 5.5 mergeSergei Golubchik2013-07-1715-15/+15
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | mysql-5.5.32 mergeSergei Golubchik2013-07-1615-15/+15
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1915-15/+15
* | | | | | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | 5.5 mergeSergei Golubchik2013-06-061-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-1/+1
* | | | | | | | 10.0-base mergeSergei Golubchik2013-04-1565-4703/+5596
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | / / / / | |_|_|/ / / / |/| | | | | |
| * | | | | | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-7/+1