mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 14:02:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/storage/innobase
History
Marko Mäkelä f69a3b2e92 After-merge fix for commit d4df7bc9b1 
The merge omitted some InnoDB and XtraDB conflict resolutions,
most notably, failing to merge the fix of MDEV-12173.

ibuf_merge_or_delete_for_page(), lock_rec_block_validate():
Invoke fil_space_acquire_silent() instead of fil_space_acquire().
This fixes MDEV-12173.

wsrep_debug, wsrep_trx_is_aborting(): Removed unused declarations.

_fil_io(): Remove. Instead, declare default parameters for the XtraDB
fil_io().

buf_read_page_low(): Declare default parameters, and clean up some
callers.

os_aio(): Correct the macro that is defined when !UNIV_PFS_IO.
2018-02-02 19:57:59 +02:00
..
api Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
btr Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
buf Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
data Merge remote-tracking branch '5.5' into 10.0 2018-01-24 12:29:31 +02:00
dict Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01: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 MDEV-12173 "Error: trying to do an operation on a dropped tablespace" 2018-01-22 16:58:13 +02:00
fsp MDEV-13557: Startup failure, unable to decrypt ibdata1 2017-08-29 14:23:34 +03:00
fts Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
fut Part 1 of MDEV-8139 Fix scrubbing tests 2017-01-04 18:21:42 +02:00
ha move to storage/innobase 2015-05-04 19:17:21 +02:00
handler Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
ibuf After-merge fix for commit d4df7bc9b1 2018-02-02 19:57:59 +02:00
include Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
lock After-merge fix for commit d4df7bc9b1 2018-02-02 19:57:59 +02:00
log MDEV-14874 innodb_encrypt_log corrupts the log when the LSN crosses 32-bit boundary 2018-01-08 09:44:40 +02:00
mach 5.6.35 2017-01-07 14:24:42 +02:00
mem Merge remote-tracking branch '5.5' into 10.0 2018-01-24 12:29:31 +02:00
mtr Merge 10.0 into 10.1 2017-03-09 08:53:08 +02:00
mysql-test/storage_engine Merge branch '10.0' into 10.1 2017-08-08 10:18:43 +02:00
os MDEV-14132 InnoDB page corruption 2017-11-06 08:53:51 +02:00
page Merge 10.0 into 10.1 2017-09-06 15:32:56 +03:00
pars MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing 2017-03-14 16:23:10 +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 Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
row Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
srv After-merge fix for commit d4df7bc9b1 2018-02-02 19:57:59 +02:00
sync Silence bogus GCC 7 warnings -Wimplicit-fallthrough 2017-05-17 08:27:04 +03:00
trx Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
usr Remove redundant UT_LIST_INIT() calls 2017-05-17 10:33:49 +03:00
ut Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01:00
CMakeLists.txt Merge branch 'github/10.0' into 10.1 2018-02-02 10:09:44 +01: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