Commit f0cb21ea authored by Marko Mäkelä's avatar Marko Mäkelä

Remove dead code is_thd_killed()

parent 9eb8a467
/* Copyright (c) 2013, Monty Program Ab. /* Copyright (c) 2013, 2018, MariaDB
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
time-consuming loops, and gracefully abort the operation if it is time-consuming loops, and gracefully abort the operation if it is
non-zero. non-zero.
thd_is_killed(thd) thd_killed(thd)
@return 0 - no KILL statement was issued, continue normally @return 0 - no KILL statement was issued, continue normally
@return 1 - there was a KILL statement, abort the execution. @return 1 - there was a KILL statement, abort the execution.
......
...@@ -4,7 +4,7 @@ Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved. ...@@ -4,7 +4,7 @@ Copyright (c) 2000, 2018, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, 2009 Google Inc. Copyright (c) 2008, 2009 Google Inc.
Copyright (c) 2009, Percona Inc. Copyright (c) 2009, Percona Inc.
Copyright (c) 2012, Facebook Inc. Copyright (c) 2012, Facebook Inc.
Copyright (c) 2013, 2017, MariaDB Corporation. Copyright (c) 2013, 2018, MariaDB Corporation.
Portions of this file contain modifications contributed and copyrighted by Portions of this file contain modifications contributed and copyrighted by
Google, Inc. Those modifications are gratefully acknowledged and are described Google, Inc. Those modifications are gratefully acknowledged and are described
...@@ -19611,15 +19611,6 @@ int ha_innobase::multi_range_read_explain_info(uint mrr_mode, char *str, size_t ...@@ -19611,15 +19611,6 @@ int ha_innobase::multi_range_read_explain_info(uint mrr_mode, char *str, size_t
return ds_mrr.dsmrr_explain_info(mrr_mode, str, size); return ds_mrr.dsmrr_explain_info(mrr_mode, str, size);
} }
/*
A helper function used only in index_cond_func_innodb
*/
bool ha_innobase::is_thd_killed()
{
return thd_kill_level(user_thd);
}
/********************************************************************** /**********************************************************************
Issue a warning that the row is too big. */ Issue a warning that the row is too big. */
UNIV_INTERN UNIV_INTERN
......
/***************************************************************************** /*****************************************************************************
Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2000, 2017, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2013, 2017, MariaDB Corporation. Copyright (c) 2013, 2018, 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
...@@ -364,10 +364,6 @@ class ha_innobase: public handler ...@@ -364,10 +364,6 @@ class ha_innobase: public handler
* @return idx_cond if pushed; NULL if not pushed * @return idx_cond if pushed; NULL if not pushed
*/ */
class Item* idx_cond_push(uint keyno, class Item* idx_cond); class Item* idx_cond_push(uint keyno, class Item* idx_cond);
/* An helper function for index_cond_func_innodb: */
bool is_thd_killed();
private: private:
/** The multi range read session object */ /** The multi range read session object */
DsMrr_impl ds_mrr; DsMrr_impl ds_mrr;
......
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