diff options
| -rw-r--r-- | sql/field.cc | 4 | ||||
| -rw-r--r-- | sql/item_func.cc | 2 | ||||
| -rw-r--r-- | sql/opt_range.cc | 7 | ||||
| -rw-r--r-- | sql/sp_pcontext.h | 2 | ||||
| -rw-r--r-- | sql/table.h | 2 |
5 files changed, 8 insertions, 9 deletions
diff --git a/sql/field.cc b/sql/field.cc index 5332607c6d5..5a90e654f5e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -1785,7 +1785,6 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs) longlong tmp; long store_tmp; int error; - bool warning_given= 0; char *end; tmp= cs->cset->scan(cs, from, from+len, MY_SEQ_SPACES); @@ -2075,8 +2074,7 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs) longlong tmp; int error= 0; char *end; - bool warning_given; - + tmp= cs->cset->scan(cs, from, from+len, MY_SEQ_SPACES); len-= (uint)tmp; from+= tmp; diff --git a/sql/item_func.cc b/sql/item_func.cc index 8d4ad54b511..4455be53c5d 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -174,7 +174,7 @@ bool Item_func::agg_arg_charsets(DTCollation &coll, for (arg= args, last= args + nargs; arg < last; arg++) { Item* conv; - uint dummy_offset; + uint32 dummy_offset; if (!String::needs_conversion(0, coll.collation, (*arg)->collation.collation, &dummy_offset)) diff --git a/sql/opt_range.cc b/sql/opt_range.cc index f036cbc799b..738fcbb91e2 100644 --- a/sql/opt_range.cc +++ b/sql/opt_range.cc @@ -5533,7 +5533,6 @@ QUICK_RANGE_SELECT *get_quick_select_for_ref(THD *thd, TABLE *table, goto err; } -ok: thd->mem_root= old_root; return quick; @@ -8067,7 +8066,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_min_in_range() boundary of cur_range, there is no need to check this range. */ if (range_idx != 0 && !(cur_range->flag & NO_MAX_RANGE) && - (key_cmp(min_max_arg_part, cur_range->max_key, min_max_arg_len) == 1)) + (key_cmp(min_max_arg_part, (byte*) cur_range->max_key, + min_max_arg_len) == 1)) continue; if (cur_range->flag & NO_MIN_RANGE) @@ -8193,7 +8193,8 @@ int QUICK_GROUP_MIN_MAX_SELECT::next_max_in_range() */ if (range_idx != min_max_ranges.elements && !(cur_range->flag & NO_MIN_RANGE) && - (key_cmp(min_max_arg_part, cur_range->min_key, min_max_arg_len) == -1)) + (key_cmp(min_max_arg_part, (byte*) cur_range->min_key, + min_max_arg_len) == -1)) continue; if (cur_range->flag & NO_MAX_RANGE) diff --git a/sql/sp_pcontext.h b/sql/sp_pcontext.h index 36e4ed06aa7..66f631f4938 100644 --- a/sql/sp_pcontext.h +++ b/sql/sp_pcontext.h @@ -50,7 +50,7 @@ typedef struct sp_label char *name; uint ip; // Instruction index int type; // begin/iter or ref/free - struct sp_pcontext *ctx; // The label's context + sp_pcontext *ctx; // The label's context } sp_label_t; typedef struct sp_cond_type diff --git a/sql/table.h b/sql/table.h index db3ce638842..26c232ea39b 100644 --- a/sql/table.h +++ b/sql/table.h @@ -274,7 +274,7 @@ typedef struct st_schema_table #define VIEW_CHECK_SKIP 2 struct st_lex; -struct select_union; +class select_union; typedef struct st_table_list { |