diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 17:46:22 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 17:46:22 +0300 |
| commit | e82fe21e3ac3141c92b7c4fb2d1fc3c083d834e8 (patch) | |
| tree | 3ecf4329b6a623165aa6cb392ae71998de50c89e /storage/maria | |
| parent | 709f0510e32981c59d7353e55a564073939db770 (diff) | |
| parent | 7f1e1309bbd54a7923cf33a37938a29171ca0993 (diff) | |
| download | mariadb-git-e82fe21e3ac3141c92b7c4fb2d1fc3c083d834e8.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ha_maria.cc | 2 | ||||
| -rw-r--r-- | storage/maria/ma_extra.c | 1 | ||||
| -rw-r--r-- | storage/maria/ma_open.c | 15 |
3 files changed, 2 insertions, 16 deletions
diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 6a8d1a559e8..7e71b361d6e 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -2708,7 +2708,7 @@ int ha_maria::external_lock(THD *thd, int lock_type) changes to commit (rollback shouldn't be tested). */ DBUG_ASSERT(!thd->get_stmt_da()->is_sent() || - thd->killed == KILL_CONNECTION); + thd->killed); /* autocommit ? rollback a transaction */ #ifdef MARIA_CANNOT_ROLLBACK if (ma_commit(trn)) diff --git a/storage/maria/ma_extra.c b/storage/maria/ma_extra.c index 7d8f8b8d27c..2697c72f2b8 100644 --- a/storage/maria/ma_extra.c +++ b/storage/maria/ma_extra.c @@ -286,7 +286,6 @@ int maria_extra(MARIA_HA *info, enum ha_extra_function function, We however do a flush here for additional safety. */ /** @todo consider porting these flush-es to MyISAM */ - DBUG_ASSERT(share->reopen == 1); error= _ma_flush_table_files(info, MARIA_FLUSH_DATA | MARIA_FLUSH_INDEX, FLUSH_FORCE_WRITE, FLUSH_FORCE_WRITE); if (!error && share->changed) diff --git a/storage/maria/ma_open.c b/storage/maria/ma_open.c index ea138142316..748f7585c67 100644 --- a/storage/maria/ma_open.c +++ b/storage/maria/ma_open.c @@ -1,4 +1,5 @@ /* Copyright (C) 2006 MySQL AB & MySQL Finland AB & TCX DataKonsult AB + Copyright (c) 2009, 2019, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -249,20 +250,6 @@ err: } /* maria_clone_internal */ -/* Make a clone of a maria table */ - -MARIA_HA *maria_clone(MARIA_SHARE *share, int mode) -{ - MARIA_HA *new_info; - mysql_mutex_lock(&THR_LOCK_maria); - new_info= maria_clone_internal(share, mode, - share->data_file_type == BLOCK_RECORD ? - share->bitmap.file.file : -1, 0); - mysql_mutex_unlock(&THR_LOCK_maria); - return new_info; -} - - /****************************************************************************** open a MARIA table |