summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sql/filesort.cc4
-rw-r--r--sql/item_cmpfunc.cc8
-rw-r--r--sql/item_func.cc16
-rw-r--r--sql/item_sum.cc8
-rw-r--r--sql/log_event.cc8
-rw-r--r--sql/sql_lex.cc2
-rw-r--r--sql/sql_select.cc4
7 files changed, 28 insertions, 22 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc
index 27c4b962515..ad46f7cc505 100644
--- a/sql/filesort.cc
+++ b/sql/filesort.cc
@@ -571,7 +571,7 @@ static void make_sortkey(register SORTPARAM *param,
change_double_for_sort(value,(byte*) to);
break;
}
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -954,7 +954,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length)
case REAL_RESULT:
sortorder->length=sizeof(double);
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index 94894fdb918..f08242b169b 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -821,7 +821,7 @@ Item *Item_func_case::find_item(String *str)
if (args[i]->val()==first_expr_real && !args[i]->null_value)
return args[i+1];
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -1166,6 +1166,9 @@ cmp_item* cmp_item::get_comparator (Item *item)
case ROW_RESULT:
return new cmp_item_row;
break;
+ default:
+ DBUG_ASSERT(0);
+ break;
}
return 0; // to satisfy compiler :)
}
@@ -1308,6 +1311,9 @@ void Item_func_in::fix_length_and_dec()
case ROW_RESULT:
array= new in_row(arg_count, item);
break;
+ default:
+ DBUG_ASSERT(0);
+ return;
}
uint j=0;
for (uint i=0 ; i < arg_count ; i++)
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 38249ef9a22..4be9b030fa1 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -260,7 +260,7 @@ Field *Item_func::tmp_table_field(TABLE *t_arg)
else
res= new Field_string(max_length, maybe_null, name, t_arg, charset());
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -910,7 +910,7 @@ String *Item_func_min_max::val_str(String *str)
}
return res;
}
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
@@ -1451,7 +1451,7 @@ bool udf_handler::get_arguments()
to+= ALIGN_SIZE(sizeof(double));
}
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
;
@@ -1909,7 +1909,7 @@ longlong Item_func_benchmark::val_int()
case STRING_RESULT:
(void) args[0]->val_str(&tmp);
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
@@ -2045,7 +2045,7 @@ Item_func_set_user_var::update()
(void) val_str(&tmp);
break;
}
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -2124,7 +2124,7 @@ Item_func_get_user_var::val_str(String *str)
return NULL;
}
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -2145,7 +2145,7 @@ double Item_func_get_user_var::val()
return (double) *(longlong*) entry->value;
case STRING_RESULT:
return atof(entry->value); // This is null terminated
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
@@ -2166,7 +2166,7 @@ longlong Item_func_get_user_var::val_int()
return *(longlong*) entry->value;
case STRING_RESULT:
return strtoull(entry->value,NULL,10); // String is null terminated
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
diff --git a/sql/item_sum.cc b/sql/item_sum.cc
index 273c5a3c1c3..eb525b1e5b9 100644
--- a/sql/item_sum.cc
+++ b/sql/item_sum.cc
@@ -350,7 +350,7 @@ double Item_sum_hybrid::val()
return (double) sum_int;
case REAL_RESULT:
return sum;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
@@ -385,7 +385,7 @@ Item_sum_hybrid::val_str(String *str)
else
str->set((longlong) sum_int,thd_charset());
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -431,7 +431,7 @@ bool Item_sum_min::add()
}
}
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
@@ -478,7 +478,7 @@ bool Item_sum_max::add()
}
}
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
diff --git a/sql/log_event.cc b/sql/log_event.cc
index bb88445876d..6f50a0da68a 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -2038,7 +2038,7 @@ void User_var_log_event::pack_info(Protocol* protocol)
buf[val_offset + val_len]= '\'';
event_len= val_offset + 1 + val_len;
break;
- case ROW_RESULT:
+ default:
DBUG_ASSERT(1);
return;
}
@@ -2111,7 +2111,7 @@ int User_var_log_event::write_data(IO_CACHE* file)
case STRING_RESULT:
pos= val;
break;
- case ROW_RESULT:
+ default:
DBUG_ASSERT(1);
return 0;
}
@@ -2163,7 +2163,7 @@ void User_var_log_event::print(FILE* file, bool short_form, char* last_db)
case STRING_RESULT:
fprintf(file, ":='%s';\n", val);
break;
- case ROW_RESULT:
+ default:
DBUG_ASSERT(1);
return;
}
@@ -2207,7 +2207,7 @@ int User_var_log_event::exec_event(struct st_relay_log_info* rli)
case STRING_RESULT:
it= new Item_string(val, val_len, charset);
break;
- case ROW_RESULT:
+ default:
DBUG_ASSERT(1);
return 0;
}
diff --git a/sql/sql_lex.cc b/sql/sql_lex.cc
index 716e37b5cb7..6b3efedc687 100644
--- a/sql/sql_lex.cc
+++ b/sql/sql_lex.cc
@@ -205,7 +205,7 @@ static int find_keyword(LEX *lex, uint len, bool function)
return (udf->type == UDFTYPE_FUNCTION) ? UDF_FLOAT_FUNC : UDA_FLOAT_SUM;
case INT_RESULT:
return (udf->type == UDFTYPE_FUNCTION) ? UDF_INT_FUNC : UDA_INT_SUM;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 5696f59a3df..2ad294f42af 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -3847,7 +3847,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
item->name,table,item->charset());
return new Field_string(item_sum->max_length,maybe_null,
item->name,table,item->charset());
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
return 0;
@@ -3907,7 +3907,7 @@ Field *create_tmp_field(THD *thd, TABLE *table,Item *item, Item::Type type,
new_field= new Field_string(item->max_length,maybe_null,
item->name,table,item->str_value.charset());
break;
- case ROW_RESULT:
+ default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
View Lorry Controller Status