Skip to content

Commit ff3f07c

Browse files
committed
Cleanup: Remove unused query node declarations
1 parent 898dcf9 commit ff3f07c

File tree

2 files changed

+1
-42
lines changed

2 files changed

+1
-42
lines changed

storage/innobase/include/que0que.h

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -247,20 +247,6 @@ ibool
247247
que_thr_peek_stop(
248248
/*==============*/
249249
que_thr_t* thr); /*!< in: query thread */
250-
/***********************************************************************//**
251-
Returns TRUE if the query graph is for a SELECT statement.
252-
@return TRUE if a select */
253-
UNIV_INLINE
254-
ibool
255-
que_graph_is_select(
256-
/*================*/
257-
que_t* graph); /*!< in: graph */
258-
/**********************************************************************//**
259-
Prints info of an SQL query graph node. */
260-
void
261-
que_node_print_info(
262-
/*================*/
263-
que_node_t* node); /*!< in: query graph node */
264250
/*********************************************************************//**
265251
Evaluate the given SQL
266252
@return error code or DB_SUCCESS */
@@ -407,25 +393,17 @@ inline void que_thr_t::set_active(bool active) { graph->set_active(active); };
407393
#endif
408394

409395
/* Query fork (or graph) types */
410-
#define QUE_FORK_SELECT_NON_SCROLL 1 /* forward-only cursor */
411-
#define QUE_FORK_SELECT_SCROLL 2 /* scrollable cursor */
412-
#define QUE_FORK_INSERT 3
413-
#define QUE_FORK_UPDATE 4
414396
#define QUE_FORK_ROLLBACK 5
415397
/* This is really the undo graph used in rollback,
416398
no signal-sending roll_node in this graph */
417399
#define QUE_FORK_PURGE 6
418-
#define QUE_FORK_EXECUTE 7
419400
#define QUE_FORK_PROCEDURE 8
420-
#define QUE_FORK_PROCEDURE_CALL 9
421401
#define QUE_FORK_MYSQL_INTERFACE 10
422402
#define QUE_FORK_RECOVERY 11
423403

424404
/* Query fork (or graph) states */
425405
#define QUE_FORK_ACTIVE 1
426406
#define QUE_FORK_COMMAND_WAIT 2
427-
#define QUE_FORK_INVALID 3
428-
#define QUE_FORK_BEING_FREED 4
429407

430408
/* Flag which is ORed to control structure statement node types */
431409
#define QUE_NODE_CONTROL_STAT 1024

storage/innobase/include/que0que.ic

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22

33
Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
4-
Copyright (c) 2020, MariaDB Corporation.
4+
Copyright (c) 2020, 2021, MariaDB Corporation.
55

66
This program is free software; you can redistribute it and/or modify it under
77
the terms of the GNU General Public License as published by the Free Software
@@ -272,22 +272,3 @@ que_thr_peek_stop(
272272

273273
return(FALSE);
274274
}
275-
276-
/***********************************************************************//**
277-
Returns TRUE if the query graph is for a SELECT statement.
278-
@return TRUE if a select */
279-
UNIV_INLINE
280-
ibool
281-
que_graph_is_select(
282-
/*================*/
283-
que_t* graph) /*!< in: graph */
284-
{
285-
if (graph->fork_type == QUE_FORK_SELECT_SCROLL
286-
|| graph->fork_type == QUE_FORK_SELECT_NON_SCROLL) {
287-
288-
return(TRUE);
289-
}
290-
291-
return(FALSE);
292-
}
293-

0 commit comments

Comments
 (0)