diff options
| -rw-r--r-- | sql/ha_partition.cc | 4 | ||||
| -rw-r--r-- | sql/sp_head.h | 6 | ||||
| -rw-r--r-- | sql/sql_error.cc | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sql/ha_partition.cc b/sql/ha_partition.cc index ed7d505f1a7..65eacf94823 100644 --- a/sql/ha_partition.cc +++ b/sql/ha_partition.cc @@ -2975,7 +2975,7 @@ bool ha_partition::setup_engine_array(MEM_ROOT *mem_root) } } - my_afree((gptr) engine_array); + my_afree((void*) engine_array); if (create_handlers(mem_root)) { @@ -2986,7 +2986,7 @@ bool ha_partition::setup_engine_array(MEM_ROOT *mem_root) DBUG_RETURN(false); err: - my_afree((gptr) engine_array); + my_afree((void*) engine_array); DBUG_RETURN(true); } diff --git a/sql/sp_head.h b/sql/sp_head.h index f91e30ab8a4..8fd2dad1563 100644 --- a/sql/sp_head.h +++ b/sql/sp_head.h @@ -364,12 +364,12 @@ public: /// Put the instruction on the backpatch list, associated with the label. int - push_backpatch(sp_instr *, struct sp_label *); + push_backpatch(sp_instr *, sp_label *); /// Update all instruction with this label in the backpatch list to /// the current position. void - backpatch(struct sp_label *); + backpatch(sp_label *); /// Start a new cont. backpatch level. If 'i' is NULL, the level is just incr. int @@ -505,7 +505,7 @@ private: DYNAMIC_ARRAY m_instr; ///< The "instructions" typedef struct { - struct sp_label *lab; + sp_label *lab; sp_instr *instr; } bp_t; List<bp_t> m_backpatch; ///< Instructions needing backpatching diff --git a/sql/sql_error.cc b/sql/sql_error.cc index a52b9bf5a14..40173351d54 100644 --- a/sql/sql_error.cc +++ b/sql/sql_error.cc @@ -347,7 +347,7 @@ Diagnostics_area::reset_diagnostics_area() { DBUG_ENTER("reset_diagnostics_area"); #ifdef DBUG_OFF - can_overwrite_status= FALSE; + m_can_overwrite_status= FALSE; /** Don't take chances in production */ m_message[0]= '\0'; m_sql_errno= 0; |