1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix trivial compile failures observed in buildbot

Browse Source
This commit is contained in:
Sergey Petrunya 2013-07-05 13:56:05 +04:00
parent bdb05fcf7c
commit 8448c68705
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/ha_partition.cc
View File

@ -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)) if (create_handlers(mem_root))
{ {
@ -2986,7 +2986,7 @@ bool ha_partition::setup_engine_array(MEM_ROOT *mem_root)
DBUG_RETURN(false); DBUG_RETURN(false);
err: err:
my_afree((gptr) engine_array); my_afree((void*) engine_array);
DBUG_RETURN(true); DBUG_RETURN(true);
} }

6
sql/sp_head.h
View File

@ -364,12 +364,12 @@ public:
/// Put the instruction on the backpatch list, associated with the label. /// Put the instruction on the backpatch list, associated with the label.
int 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 /// Update all instruction with this label in the backpatch list to
/// the current position. /// the current position.
void void
backpatch(struct sp_label *); backpatch(sp_label *);
/// Start a new cont. backpatch level. If 'i' is NULL, the level is just incr. /// Start a new cont. backpatch level. If 'i' is NULL, the level is just incr.
int int
@ -505,7 +505,7 @@ private:
DYNAMIC_ARRAY m_instr; ///< The "instructions" DYNAMIC_ARRAY m_instr; ///< The "instructions"
typedef struct typedef struct
{ {
struct sp_label *lab; sp_label *lab;
sp_instr *instr; sp_instr *instr;
} bp_t; } bp_t;
List<bp_t> m_backpatch; ///< Instructions needing backpatching List<bp_t> m_backpatch; ///< Instructions needing backpatching

2
sql/sql_error.cc
View File

@ -347,7 +347,7 @@ Diagnostics_area::reset_diagnostics_area()
{ {
DBUG_ENTER("reset_diagnostics_area"); DBUG_ENTER("reset_diagnostics_area");
#ifdef DBUG_OFF #ifdef DBUG_OFF
can_overwrite_status= FALSE; m_can_overwrite_status= FALSE;
/** Don't take chances in production */ /** Don't take chances in production */
m_message[0]= '\0'; m_message[0]= '\0';
m_sql_errno= 0; m_sql_errno= 0;