mariadb/storage/innobase
Marko Mäkelä f9069a3dc0 MDEV-12674 Post-merge fix: Include accidentally omitted changes
In 10.2, the definition of simple_counter resides in the file
sync0types.h, not in the file os0sync.h which has been removed.
2017-05-12 15:44:17 +03:00
..
btr Fix some integer type mismatch. 2017-05-10 12:45:46 +03:00
buf Merge 10.1 into 10.2 2017-05-12 13:29:24 +03:00
data MDEV-12488 Remove type mismatch in InnoDB printf-like calls 2017-04-21 18:03:15 +03:00
dict Fix some integer type mismatch. 2017-05-10 12:45:46 +03:00
eval MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_NONINL 2017-03-17 12:42:07 +02:00
fil Fix some integer type mismatch. 2017-05-10 12:45:46 +03:00
fsp Merge branch '10.1' into 10.2 2017-03-30 12:48:42 +02:00
fts BUG#24331265 MEMORY LEAK IN SOME INNODB FTS TESTS 2017-04-24 15:33:51 +03:00
fut MDEV-12270 Port MySQL 8.0 Bug#21141390 REMOVE UNUSED FUNCTIONS AND CONVERT GLOBAL SYMBOLS TO STATIC 2017-03-17 12:48:50 +02:00
gis Minor code cleanup. 2017-04-17 03:20:34 +03:00
ha Bug#24346574 PAGE CLEANER THREAD, ASSERT BLOCK->N_POINTERS == 0 2017-04-26 23:03:27 +03:00
handler MDEV-11197: TrxInInnoDB::is_aborted(const trx_t*): Assertion `srv_read_only_mode || trx->in_depth > 0' failed 2017-05-10 23:13:06 +03:00
ibuf Fix some integer type mismatch. 2017-05-10 12:45:46 +03:00
include MDEV-12674 Post-merge fix: Include accidentally omitted changes 2017-05-12 15:44:17 +03:00
lock Merge 10.1 into 10.2 2017-05-12 13:29:24 +03:00
log Merge 10.1 into 10.2 2017-05-06 14:36:46 +03:00
mach Fix Bug#24707869 GCC 5 AND 6 MISCOMPILE MACH_PARSE_COMPRESSED 2017-04-26 23:03:29 +03:00
mem MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_NONINL 2017-03-17 12:42:07 +02:00
mtr Bug #24793413 LOG PARSING BUFFER OVERFLOW 2017-04-26 23:03:32 +03:00
mysql-test/storage_engine MDEV-11782: Redefine the innodb_encrypt_log format 2017-02-15 08:07:20 +02:00
os Fix some integer type mismatch. 2017-05-10 12:45:46 +03:00
page MDEV-12720 recovery fails with "Generic error" for ROW_FORMAT=compressed 2017-05-09 11:41:35 +03:00
pars Remove unused tokens from the InnoDB SQL parser. 2017-04-17 03:20:34 +03:00
que MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_NONINL 2017-03-17 12:42:07 +02:00
read Merge InnoDB 5.7 from mysql-5.7.9. 2016-09-02 13:22:28 +03:00
rem Bug#23044098 INSERT OF GIS DATA INTO RTREE HITS ASSERT IN RTR_CUR_RESTORE_POSITION_FUNC() 2017-04-26 23:03:30 +03:00
row MDEV-12674 Post-merge fix: Include accidentally omitted changes 2017-05-12 15:44:17 +03:00
srv MDEV-12776 Do not create the InnoDB temporary tablespace in innodb_read_only mode 2017-05-10 20:23:01 +03:00
sync MDEV-12679 purge_sys_t::~purge_sys_t(): Assertion `latch.magic_n == 0' failed on --bootstrap (CMAKE_BUILD_TYPE=Debug) 2017-05-10 14:14:50 +03:00
trx MDEV-12776 Do not create the InnoDB temporary tablespace in innodb_read_only mode 2017-05-10 20:23:01 +03:00
usr MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_NONINL 2017-03-17 12:42:07 +02:00
ut MDEV-8684: innodb ut_delay - no maths 2017-05-09 13:07:15 +10:00
bzip2.cmake cleanup: innodb files in cmake/ 2017-03-29 00:40:22 +02:00
CMakeLists.txt Merge 10.1 into 10.2 2017-05-06 14:36:46 +03: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
innodb.cmake cleanup: innodb files in cmake/ 2017-03-29 00:40:22 +02:00
lz4.cmake cleanup: innodb files in cmake/ 2017-03-29 00:40:22 +02:00
lzma.cmake cleanup: innodb files in cmake/ 2017-03-29 00:40:22 +02:00
lzo.cmake cleanup: innodb files in cmake/ 2017-03-29 00:40:22 +02:00
plugin_exports Solaris compilation failure: xtradb is linked in statically, ha_innodb.so needs 2014-05-01 14:05:52 +02:00
snappy.cmake cleanup: innodb files in cmake/ 2017-03-29 00:40:22 +02:00