Sergei Golubchik
a79d46c3a4
Merge branch 'merge-innodb-5.6' into 10.0
2016-06-21 14:58:19 +02:00
Sergei Golubchik
720e04ff67
5.6.31
2016-06-21 14:21:03 +02:00
Sergei Golubchik
6d06fbbd1d
move to storage/innobase
2015-05-04 19:17:21 +02:00
Sergei Golubchik
f2cb45daf3
Merge remote-tracking branch 'origin/10.0' into 10.0
2015-02-22 21:45:24 +01:00
Sergei Golubchik
6b05688f6d
innodb 5.6.23
2015-02-18 17:59:21 +01:00
Sergei Golubchik
d7e7862364
Merge branch '5.5' into 10.0
2015-02-18 15:16:27 +01:00
Sergei Golubchik
476a8660e6
InnoDB 5.6.22
2015-01-21 14:33:39 +01:00
Sergei Golubchik
8ee9d19607
innodb 5.6.17
2014-05-07 17:32:23 +02: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
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