14 commits

Author	SHA1	Message	Date
Marko Mäkelä	ad0c218a44	Merge 10.0 into 10.1 ... Also, implement MDEV-11027 a little differently from 5.5 and 10.0: recv_apply_hashed_log_recs(): Change the return type back to void (DB_SUCCESS was always returned). Report progress also via systemd using sd_notifyf().	2017-03-09 08:53:08 +02:00
Vicențiu Ciorbaru	1acfa942ed	Merge branch '5.5' into 10.0	2017-03-03 01:37:54 +02:00
Sergei Golubchik	3361aee591	Merge branch '10.0' into 10.1	2016-06-28 22:01:55 +02:00
Sergei Golubchik	720e04ff67	5.6.31	2016-06-21 14:21:03 +02:00
Sergei Golubchik	658992699b	Merge tag 'mariadb-10.0.20' into 10.1	2015-06-27 20:35:26 +02:00
Sergei Golubchik	139ba26dba	5.6.25	2015-06-16 10:57:05 +02:00
Sergei Golubchik	6d06fbbd1d	move to storage/innobase	2015-05-04 19:17:21 +02:00
Monty	d7d589dc01	Push for testing of encryption	2015-02-10 10:21:17 +01:00
Sergei Golubchik	e2e5d07b28	MDEV-6184 10.0.11 merge ... InnoDB 5.6.16	2014-05-06 09:57:39 +02: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	ab83952f29	10.0-base merge	2013-01-31 09:48:19 +01: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/page/page0page.c (Browse further)