diff options
Diffstat (limited to 'storage/innobase/include/que0que.ic')
| -rw-r--r-- | storage/innobase/include/que0que.ic | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/storage/innobase/include/que0que.ic b/storage/innobase/include/que0que.ic index 1775467781a..5b775820df7 100644 --- a/storage/innobase/include/que0que.ic +++ b/storage/innobase/include/que0que.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2010, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved. 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 @@ -23,8 +23,6 @@ Query graph Created 5/27/1996 Heikki Tuuri *******************************************************/ -#include "usr0sess.h" - /***********************************************************************//** Gets the trx of a query thread. */ UNIV_INLINE @@ -84,11 +82,9 @@ UNIV_INLINE ulint que_node_get_type( /*==============*/ - que_node_t* node) /*!< in: graph node */ + const que_node_t* node) /*!< in: graph node */ { - ut_ad(node); - - return(((que_common_t*) node)->type); + return(reinterpret_cast<const que_common_t*>(node)->type); } /***********************************************************************//** @@ -106,7 +102,7 @@ que_node_get_val( /***********************************************************************//** Gets the value buffer size of a graph node. -@return val buffer size, not defined if val.data == NULL in node */ +@return val buffer size, not defined if val.data == NULL in node */ UNIV_INLINE ulint que_node_get_val_buf_size( @@ -161,7 +157,7 @@ que_node_get_data_type( /*********************************************************************//** Catenates a query graph node to a list of them, possible empty list. -@return one-way list of nodes */ +@return one-way list of nodes */ UNIV_INLINE que_node_t* que_node_list_add_last( @@ -216,7 +212,7 @@ que_node_list_get_last( } /*********************************************************************//** Gets the next list node in a list of query graph nodes. -@return next node in a list of nodes */ +@return next node in a list of nodes */ UNIV_INLINE que_node_t* que_node_get_next( @@ -228,7 +224,7 @@ que_node_get_next( /*********************************************************************//** Gets a query graph node list length. -@return length, for NULL list 0 */ +@return length, for NULL list 0 */ UNIV_INLINE ulint que_node_list_get_len( @@ -251,7 +247,7 @@ que_node_list_get_len( /*********************************************************************//** Gets the parent node of a query graph node. -@return parent node or NULL */ +@return parent node or NULL */ UNIV_INLINE que_node_t* que_node_get_parent( @@ -292,7 +288,7 @@ que_thr_peek_stop( /***********************************************************************//** Returns TRUE if the query graph is for a SELECT statement. -@return TRUE if a select */ +@return TRUE if a select */ UNIV_INLINE ibool que_graph_is_select( @@ -307,3 +303,4 @@ que_graph_is_select( return(FALSE); } + |