Skip to content

M
MariaDB
Commit 00addf22 authored by unknown's avatar unknown
Browse files
Options

Merge gluh@192.168.21.1:/usr/home/bk/mysql-4.1 

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.uvar


sql/filesort.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
parents b3982368 679fe2ee
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 22 deletions
sql/filesort.cc
View file @ 00addf22
......@@ -561,7 +561,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;
......@@ -971,7 +971,7 @@ sortlength(SORT_FIELD *sortorder, uint s_length, bool *multi_byte_charset)
case REAL_RESULT:
sortorder->length=sizeof(double);
break;
case ROW_RESULT:
default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
......
sql/item_cmpfunc.cc
View file @ 00addf22
......@@ -840,7 +840,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;
......@@ -1224,6 +1224,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 :)
}
......@@ -1366,6 +1369,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++)
......
sql/item_func.cc
View file @ 00addf22
......@@ -251,7 +251,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;
......@@ -1466,7 +1466,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);
;
......@@ -1926,7 +1926,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;
......@@ -2062,7 +2062,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;
......@@ -2143,7 +2143,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;
......@@ -2164,7 +2164,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;
......@@ -2185,7 +2185,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;
......
sql/item_sum.cc
View file @ 00addf22
......@@ -387,7 +387,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;
......@@ -422,7 +422,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;
......@@ -467,7 +467,7 @@ bool Item_sum_min::add()
}
}
break;
case ROW_RESULT:
default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
......@@ -513,7 +513,7 @@ bool Item_sum_max::add()
}
}
break;
case ROW_RESULT:
default:
// This case should never be choosen
DBUG_ASSERT(0);
break;
......
sql/log_event.cc
View file @ 00addf22
......@@ -2004,7 +2004,7 @@ void User_var_log_event::pack_info(Protocol* protocol)
memcpy(buf + val_offset + 1, val, val_len);
buf[val_offset + val_len + 1]= '\'';
break;
case ROW_RESULT:
default:
DBUG_ASSERT(1);
return;
}
......@@ -2069,7 +2069,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;
}
......@@ -2121,7 +2121,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;
}
......@@ -2165,7 +2165,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;
}
......
sql/sql_lex.cc
View file @ 00addf22
......@@ -207,7 +207,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;
......
sql/sql_select.cc
View file @ 00addf22
......@@ -4007,7 +4007,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;
......@@ -4067,7 +4067,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;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7