diff options
Diffstat (limited to 'storage/innobase/include/que0que.h')
| -rw-r--r-- | storage/innobase/include/que0que.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h index 531794ce688..ba8828623af 100644 --- a/storage/innobase/include/que0que.h +++ b/storage/innobase/include/que0que.h @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1996, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1996, 2012, 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 @@ -42,7 +42,7 @@ of SQL execution in the UNIV_SQL_DEBUG version */ extern ibool que_trace_on; /** Mutex protecting the query threads. */ -extern mutex_t que_thr_mutex; +extern ib_mutex_t que_thr_mutex; /***********************************************************************//** Creates a query graph fork node. @@ -310,7 +310,7 @@ que_node_print_info( Evaluate the given SQL @return error code or DB_SUCCESS */ UNIV_INTERN -enum db_err +dberr_t que_eval_sql( /*=========*/ pars_info_t* info, /*!< in: info struct, or NULL */ @@ -349,7 +349,7 @@ que_close(void); /* Query graph query thread node: the fields are protected by the trx_t::mutex with the exceptions named below */ -struct que_thr_struct{ +struct que_thr_t{ que_common_t common; /*!< type: QUE_NODE_THR */ ulint magic_n; /*!< magic number to catch memory corruption */ @@ -374,7 +374,7 @@ struct que_thr_struct{ thus far */ ulint lock_state; /*!< lock state of thread (table or row) */ - struct srv_slot_struct* + struct srv_slot_t* slot; /* The thread slot in the wait array in srv_sys_t */ /*------------------------------*/ @@ -398,7 +398,7 @@ struct que_thr_struct{ #define QUE_THR_MAGIC_FREED 123461526 /* Query graph fork node: its fields are protected by the query thread mutex */ -struct que_fork_struct{ +struct que_fork_t{ que_common_t common; /*!< type: QUE_NODE_FORK */ que_t* graph; /*!< query graph of this node */ ulint fork_type; /*!< fork type */ |