7 commits

Author	SHA1	Message	Date
Jan Lindström	8984bef2e4	MDEV-6172: Monitor progress of ALTER TABLE ... ADD INDEX, ... ALGORITHM=INPLACE for InnoDB Added thd_progress calls to row_merge_sort to give some hint how merge sort progresses.	2014-08-18 10:52:59 +03:00
Jan Lindström	56c4b016ad	Fiix random test failures on fil_decompress_page_2 function. ... Analysis: InnoDB writes also files that do not contain FIL-header. This could lead incorrect analysis on os_fil_read_func function when it tries to see is page page compressed based on FIL_PAGE_TYPE field on FIL-header. With bad luck uncompressed page that does not contain FIL-headed, the byte on FIL_PAGE_TYPE position could indicate that page is page comrpessed. Fix: Upper layer must indicate is file space page compressed or not. If this is not yet known, we need to read the FIL-header and find it out. Files that we know that are not page compressed we can always just provide FALSE.	2014-07-25 14:37:10 +03:00
Sergei Golubchik	15ee97214d	InnoDB 5.6.15 merge. ... update test results	2014-02-26 19:36:33 +01:00
Sergei Golubchik	27d45e4696	MDEV-5574 Set AUTO_INCREMENT below max value of column. ... Update InnoDB to 5.6.14 Apply MySQL-5.6 hack for MySQL Bug#16434374 Move Aria-only HA_RTREE_INDEX from my_base.h to maria_def.h (breaks an assert in InnoDB) Fix InnoDB memory leak	2014-02-01 09:33:26 +01:00
Michael Widenius	068c61978e	Temporary commit of 10.0-merge	2013-03-26 00:03:13 +02:00
Sergei Golubchik	40e94a3734	merge with 5.5	2012-11-03 12:28:51 +01:00
Michael Widenius	1d0f70c2f8	Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6	2012-08-01 17:27:34 +03:00

Renamed from storage/innobase/row/row0merge.c (Browse further)