mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-02 03:51:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/innobase
History
Vicențiu Ciorbaru 226dd699df Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0 
Following merge from 5.6.36, this merge also rejects changes that
collided with the rejection of 6ca4f693c1ce472e2b1bf7392607c2d1124b4293.

We initially rejected 6ca4f693c1ce472e2b1bf7392607c2d1124b4293 because
it was introducing a new storage engine API method.
2017-07-29 20:51:29 +03:00
..
api Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0 2017-07-29 20:51:29 +03:00
btr Merge remote-tracking branch 'origin/10.0' into 10.0 2017-05-18 15:45:55 +03:00
buf MDEV-13039 innodb_fast_shutdown=0 may fail to purge all undo log 2017-06-09 16:20:42 +03:00
data 5.6.31 2016-06-21 14:21:03 +02:00
dict Merge remote-tracking branch 'origin/5.5' into 10.0 2017-07-25 00:41:54 +03:00
dyn Merge branch '5.5' into 10.0 2017-03-03 01:37:54 +02:00
eval move to storage/innobase 2015-05-04 19:17:21 +02:00
fil Merge remote-tracking branch 'origin/10.0' into 10.0 2017-05-18 15:45:55 +03:00
fsp MDEV-12609: Allow suppression of InnoDB log messages about reserving extents 2017-06-08 10:34:10 +03:00
fts MDEV-11233 CREATE FULLTEXT INDEX with a token longer than 127 bytes 2017-01-27 10:19:39 +02:00
fut move to storage/innobase 2015-05-04 19:17:21 +02:00
ha move to storage/innobase 2015-05-04 19:17:21 +02:00
handler Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0 2017-07-29 20:51:29 +03:00
ibuf ibuf_get_volume_buffered_hash(): Use a proper type cast 2017-05-18 09:07:15 +03:00
include Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0 2017-07-29 20:51:29 +03:00
lock Never pass NULL to innobase_get_stmt() 2017-05-17 08:11:01 +03:00
log MDEV-12975 InnoDB redo log minimum size check uses detected file size instead of requested innodb_log_file_size 2017-06-19 15:59:19 +03:00
mach 5.6.35 2017-01-07 14:24:42 +02:00
mem 5.6.31 2016-06-21 14:21:03 +02:00
mtr Merge branch '5.5' into 10.0 2017-03-03 01:37:54 +02:00
mysql-test/storage_engine 5.5 merge 2014-11-19 17:23:39 +01:00
os Merge branch 'merge-innodb-5.6' into bb-10.0-vicentiu 2017-05-17 14:53:28 +03:00
page Fix warnings in innochecksum compilation 2017-05-17 08:00:24 +03:00
pars 5.6.31 2016-06-21 14:21:03 +02:00
que 5.6.24 2015-05-04 22:13:46 +02:00
read move to storage/innobase 2015-05-04 19:17:21 +02:00
rem Fix some __attribute__((nonnull)) misuse 2017-05-18 09:07:15 +03:00
row Merge remote-tracking branch 'merge/merge-innodb-5.6' into 10.0 2017-07-29 20:51:29 +03:00
srv MDEV-13325: InnoDB assert dict_sys->size > 0 during ALTER TABLE 2017-07-21 16:05:20 +03:00
sync Silence bogus GCC 7 warnings -Wimplicit-fallthrough 2017-05-17 08:07:02 +03:00
trx MDEV-13039 innodb_fast_shutdown=0 may fail to purge all undo log 2017-06-09 16:20:42 +03:00
usr Remove redundant UT_LIST_INIT() calls 2017-05-17 10:33:49 +03:00
ut 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
CMakeLists.txt MDEV-8883 more cross-compiling fixes 2015-10-24 19:58:34 +02:00
compile-innodb move to storage/innobase 2015-05-04 19:17:21 +02:00
COPYING.Google move to storage/innobase 2015-05-04 19:17:21 +02:00
COPYING.Percona move to storage/innobase 2015-05-04 19:17:21 +02:00
Doxyfile move to storage/innobase 2015-05-04 19:17:21 +02:00
ha_innodb.def move to storage/innobase 2015-05-04 19:17:21 +02:00
plugin_exports Solaris compilation failure: xtradb is linked in statically, ha_innodb.so needs 2014-05-01 14:05:52 +02:00