diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-11 00:23:17 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-11 13:47:16 +0100 |
| commit | 49bcc82686c9c305d376183ba4f7bafcbab96bc3 (patch) | |
| tree | 24321dfbc4350532990dcc60b8eec441b6b9ca00 /storage | |
| parent | 7ed01563842cef3a5f8fe13d8538cd766fb8fc7a (diff) | |
| parent | b88542681b884951308e49c99caa3435cb719f09 (diff) | |
| download | mariadb-git-49bcc82686c9c305d376183ba4f7bafcbab96bc3.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/buf/buf0buf.cc | 2 | ||||
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/buf/buf0buf.cc | 2 | ||||
| -rw-r--r-- | storage/xtradb/include/univ.i | 2 | ||||
| -rw-r--r-- | storage/xtradb/row/row0mysql.cc | 1 |
5 files changed, 8 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc index 445a6597f7d..d82e1413677 100644 --- a/storage/innobase/buf/buf0buf.cc +++ b/storage/innobase/buf/buf0buf.cc @@ -4603,6 +4603,8 @@ evict_from_pool: buf_block_unfix(fix_block); buf_pool_mutex_exit(buf_pool); rw_lock_x_unlock(&fix_block->lock); + + *err = DB_PAGE_CORRUPTED; return NULL; } } diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index 67dba501ff4..c7414d9c766 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -4655,6 +4655,8 @@ end: DICT_ERR_IGNORE_NONE); fk_tables.pop_front(); } + + table->data_dir_path= NULL; } funct_exit: diff --git a/storage/xtradb/buf/buf0buf.cc b/storage/xtradb/buf/buf0buf.cc index 89ab1e2e3b0..6d9ee64668a 100644 --- a/storage/xtradb/buf/buf0buf.cc +++ b/storage/xtradb/buf/buf0buf.cc @@ -3372,6 +3372,8 @@ evict_from_pool: mutex_enter(&buf_pool->LRU_list_mutex); buf_block_unfix(fix_block); mutex_exit(&buf_pool->LRU_list_mutex); + + *err = DB_PAGE_CORRUPTED; return NULL; } } diff --git a/storage/xtradb/include/univ.i b/storage/xtradb/include/univ.i index 93ab71bf46c..e6c4917f532 100644 --- a/storage/xtradb/include/univ.i +++ b/storage/xtradb/include/univ.i @@ -45,7 +45,7 @@ Created 1/20/1994 Heikki Tuuri #define INNODB_VERSION_MAJOR 5 #define INNODB_VERSION_MINOR 6 -#define INNODB_VERSION_BUGFIX 36 +#define INNODB_VERSION_BUGFIX 38 #ifndef PERCONA_INNODB_VERSION #define PERCONA_INNODB_VERSION 83.0 diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index 549a19799b3..ce4fe7f53ea 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -5372,6 +5372,7 @@ end: trx_rollback_to_savepoint(trx, NULL); trx->error_state = DB_SUCCESS; } + table->data_dir_path= NULL; } funct_exit: |