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
872649c7ba
Merge branch '5.5' into 10.0
2016-04-26 23:05:26 +02:00
Sergei Golubchik
1623995158
Merge branch '5.5' into 10.0
2015-12-13 00:10:40 +01:00
Jan Lindström
9a5787db51
Merge commit '96badb16afcf' into 10.0
...
Conflicts:
client/mysql_upgrade.c
mysql-test/r/func_misc.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/innodb/r/innodb-fk.result
mysql-test/t/subselect_sj_mat.test
sql/item.cc
sql/item_func.cc
sql/log.cc
sql/log_event.cc
sql/rpl_utility.cc
sql/slave.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_select.cc
storage/innobase/dict/dict0crea.c
storage/innobase/dict/dict0dict.c
storage/innobase/handler/ha_innodb.cc
storage/xtradb/dict/dict0crea.c
storage/xtradb/dict/dict0dict.c
storage/xtradb/handler/ha_innodb.cc
vio/viosslfactories.c
2015-08-03 23:09:43 +03:00
Sergei Golubchik
6d06fbbd1d
move to storage/innobase
2015-05-04 19:17:21 +02:00
Sergei Golubchik
75796d9ecb
InnoDB 5.6.20
2014-09-11 16:42:54 +02:00
Sergei Golubchik
e2e5d07b28
MDEV-6184 10.0.11 merge
...
InnoDB 5.6.16
2014-05-06 09:57:39 +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
