10 commits

Author	SHA1	Message	Date
Jan Lindström	e2e809860e	Pass down the information should we encrypt the page at os0file.cc ... when page compression and google encryption is used.	2015-02-10 10:21:18 +01:00
Monty	d7d589dc01	Push for testing of encryption	2015-02-10 10:21:17 +01:00
Jan Lindström	df4dd593f2	MDEV-6247: Merge 10.0-galera to 10.1. ... Merged lp:maria/maria-10.0-galera up to revision 3879. Added a new functions to handler API to forcefully abort_transaction, producing fake_trx_id, get_checkpoint and set_checkpoint for XA. These were added for future possiblity to add more storage engines that could use galera replication.	2014-08-26 15:43:46 +03:00
Jan Lindström	7322270a05	Set actual compressed page size also on read code path to buffer pool so ... that we can later use it to avoid unnecessary trim operations.	2014-03-04 17:14:08 +02:00
Jan Lindström	96100d6652	Merge: lp:maria/10.0 latest.	2014-03-03 14:27:56 +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
Jan Lindström	5e55d1ced5	Changes for Fusion-io multi-threaded flush, page compressed tables and ... tables using atomic write/table. This is work in progress and some parts are at most POC quality.	2013-12-19 14:36:38 +02:00
Michael Widenius	068c61978e	Temporary commit of 10.0-merge	2013-03-26 00:03:13 +02:00
Sergei Golubchik	e1f681c99b	10.0-base -> 10.0-monty	2012-10-19 20:38:59 +02: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/buf/buf0rea.c (Browse further)