Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
f0cb21ea
Commit
f0cb21ea
authored
Nov 02, 2018
by
Marko Mäkelä
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove dead code is_thd_killed()
parent
9eb8a467
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
17 deletions
+4
-17
include/mysql/service_kill_statement.h
include/mysql/service_kill_statement.h
+2
-2
storage/xtradb/handler/ha_innodb.cc
storage/xtradb/handler/ha_innodb.cc
+1
-10
storage/xtradb/handler/ha_innodb.h
storage/xtradb/handler/ha_innodb.h
+1
-5
No files found.
include/mysql/service_kill_statement.h
View file @
f0cb21ea
/* 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.
...
...
storage/xtradb/handler/ha_innodb.cc
View file @
f0cb21ea
...
@@ -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, 201
7
, MariaDB Corporation.
Copyright (c) 2013, 201
8
, 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
...
...
storage/xtradb/handler/ha_innodb.h
View file @
f0cb21ea
/*****************************************************************************
/*****************************************************************************
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, 201
7
, MariaDB Corporation.
Copyright (c) 2013, 201
8
, 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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment