Vicențiu Ciorbaru
61e2f43e05
Remove ut_win_init_time from innodb
...
The patch was brought in from 5.6.39 merge and we don't need it in
MariaDB
2018-01-25 19:50:13 +02:00
Vicențiu Ciorbaru
f775ee6006
Fix innodb compilation failure on Windows
...
We don't need to print an error when loading kernel32.dll. If we can't
load it we'll automatically crash. Reviewed by wlad@mariadb.com
2018-01-25 11:34:56 +02:00
Vicențiu Ciorbaru
3699a4b5c0
Merge branch 'merge-innodb-5.6' into 10.0
2018-01-24 18:23:25 +02:00
Vicențiu Ciorbaru
3dfe148074
5.6.39
2018-01-23 17:43:37 +02:00
Jan Lindström
99404c3437
MDEV-9276: MySQL Bug #78754 : FK definitions missing from SHOW CREATE TABLE in "innodb_read_only" mode
2015-12-14 22:10:37 +02:00
Sergei Golubchik
6d06fbbd1d
move to storage/innobase
2015-05-04 19:17:21 +02:00
Sergei Golubchik
6b05688f6d
innodb 5.6.23
2015-02-18 17:59:21 +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
Michael Widenius
068c61978e
Temporary commit of 10.0-merge
2013-03-26 00:03:13 +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