summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-11-17 20:04:11 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-11-17 20:04:11 +0200
commit77a245fe5658b8d6d937620586ecd802b3432a78 (patch)
tree811e06786f2db51675b76b3d4549920145693f06
parent009674dc52841061dd8495fd045102fef7721826 (diff)
downloadmariadb-git-77a245fe5658b8d6d937620586ecd802b3432a78.tar.gz
MDEV-13564: Remove an unused return value
When commit 09af00cbde1d62dfda574dee10e5c0fd240c3f7f removed the crash-upgrade logic of old TRUNCATE TABLE from MariaDB 10.2 and 10.3, it actually made the return value of dict_drop_index_tree() redundant.
-rw-r--r--storage/innobase/dict/dict0crea.cc15
-rw-r--r--storage/innobase/include/dict0crea.h11
2 files changed, 6 insertions, 20 deletions
diff --git a/storage/innobase/dict/dict0crea.cc b/storage/innobase/dict/dict0crea.cc
index acc8463c3fd..19ad2e5f33c 100644
--- a/storage/innobase/dict/dict0crea.cc
+++ b/storage/innobase/dict/dict0crea.cc
@@ -901,13 +901,8 @@ dict_create_index_tree_in_mem(
/** Drop the index tree associated with a row in SYS_INDEXES table.
@param[in,out] rec SYS_INDEXES record
@param[in,out] pcur persistent cursor on rec
-@param[in,out] mtr mini-transaction
-@return whether freeing the B-tree was attempted */
-bool
-dict_drop_index_tree(
- rec_t* rec,
- btr_pcur_t* pcur,
- mtr_t* mtr)
+@param[in,out] mtr mini-transaction */
+void dict_drop_index_tree(rec_t* rec, btr_pcur_t* pcur, mtr_t* mtr)
{
byte* ptr;
ulint len;
@@ -927,8 +922,7 @@ dict_drop_index_tree(
if (root_page_no == FIL_NULL) {
/* The tree has already been freed */
-
- return(false);
+ return;
}
compile_time_assert(FIL_NULL == 0xffffffff);
@@ -955,10 +949,7 @@ dict_drop_index_tree(
mach_read_from_8(ptr), mtr);
}
s->release();
- return true;
}
-
- return false;
}
/*********************************************************************//**
diff --git a/storage/innobase/include/dict0crea.h b/storage/innobase/include/dict0crea.h
index ed68b7f57b8..45a951eaac5 100644
--- a/storage/innobase/include/dict0crea.h
+++ b/storage/innobase/include/dict0crea.h
@@ -1,7 +1,7 @@
/*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved.
-Copyright (c) 2017, 2018, MariaDB Corporation.
+Copyright (c) 2017, 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 the Free Software
@@ -99,13 +99,8 @@ dict_create_index_tree(
/** Drop the index tree associated with a row in SYS_INDEXES table.
@param[in,out] rec SYS_INDEXES record
@param[in,out] pcur persistent cursor on rec
-@param[in,out] mtr mini-transaction
-@return whether freeing the B-tree was attempted */
-bool
-dict_drop_index_tree(
- rec_t* rec,
- btr_pcur_t* pcur,
- mtr_t* mtr);
+@param[in,out] mtr mini-transaction */
+void dict_drop_index_tree(rec_t* rec, btr_pcur_t* pcur, mtr_t* mtr);
/***************************************************************//**
Creates an index tree for the index if it is not a member of a cluster.