Commit 77a245fe authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-13564: Remove an unused return value

When commit 09af00cb
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.
parent 009674dc
...@@ -901,13 +901,8 @@ dict_create_index_tree_in_mem( ...@@ -901,13 +901,8 @@ dict_create_index_tree_in_mem(
/** Drop the index tree associated with a row in SYS_INDEXES table. /** Drop the index tree associated with a row in SYS_INDEXES table.
@param[in,out] rec SYS_INDEXES record @param[in,out] rec SYS_INDEXES record
@param[in,out] pcur persistent cursor on rec @param[in,out] pcur persistent cursor on rec
@param[in,out] mtr mini-transaction @param[in,out] mtr mini-transaction */
@return whether freeing the B-tree was attempted */ void dict_drop_index_tree(rec_t* rec, btr_pcur_t* pcur, mtr_t* mtr)
bool
dict_drop_index_tree(
rec_t* rec,
btr_pcur_t* pcur,
mtr_t* mtr)
{ {
byte* ptr; byte* ptr;
ulint len; ulint len;
...@@ -927,8 +922,7 @@ dict_drop_index_tree( ...@@ -927,8 +922,7 @@ dict_drop_index_tree(
if (root_page_no == FIL_NULL) { if (root_page_no == FIL_NULL) {
/* The tree has already been freed */ /* The tree has already been freed */
return;
return(false);
} }
compile_time_assert(FIL_NULL == 0xffffffff); compile_time_assert(FIL_NULL == 0xffffffff);
...@@ -955,10 +949,7 @@ dict_drop_index_tree( ...@@ -955,10 +949,7 @@ dict_drop_index_tree(
mach_read_from_8(ptr), mtr); mach_read_from_8(ptr), mtr);
} }
s->release(); s->release();
return true;
} }
return false;
} }
/*********************************************************************//** /*********************************************************************//**
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 1996, 2016, Oracle and/or its affiliates. All Rights Reserved. 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 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 the terms of the GNU General Public License as published by the Free Software
...@@ -99,13 +99,8 @@ dict_create_index_tree( ...@@ -99,13 +99,8 @@ dict_create_index_tree(
/** Drop the index tree associated with a row in SYS_INDEXES table. /** Drop the index tree associated with a row in SYS_INDEXES table.
@param[in,out] rec SYS_INDEXES record @param[in,out] rec SYS_INDEXES record
@param[in,out] pcur persistent cursor on rec @param[in,out] pcur persistent cursor on rec
@param[in,out] mtr mini-transaction @param[in,out] mtr mini-transaction */
@return whether freeing the B-tree was attempted */ void dict_drop_index_tree(rec_t* rec, btr_pcur_t* pcur, mtr_t* mtr);
bool
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. Creates an index tree for the index if it is not a member of a cluster.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment