Jan Lindström
105060e307
Fix compiler warnings.
2014-05-23 08:10:54 +03:00
Jan Lindström
d12dbe77e2
MDEV-6246: Merge 10.0.10-FusionIO to 10.1.
2014-05-22 14:24:00 +03:00
Sergei Golubchik
e2e5d07b28
MDEV-6184 10.0.11 merge
...
InnoDB 5.6.16
2014-05-06 09:57:39 +02:00
Jan Lindström
96100d6652
Merge: lp:maria/10.0 latest.
2014-03-03 14:27:56 +02:00
Sergei Golubchik
15ee97214d
InnoDB 5.6.15 merge.
...
update test results
2014-02-26 19:36:33 +01:00
Jan Lindström
8c5d5bc5de
Fixed merge error on InnoDB page compression level handling.
...
Merged page compression feature to XtraDB storage engine.
Added feature where page compression can use lz4 compression
method (innodb_use_lz4, default OFF).
2014-02-03 10:08:15 +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
Sergei Golubchik
d28d3ba40d
10.0-base merge
2013-12-16 13:02:21 +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