mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
Bug fix: for SHOW STATUS (when ssl is used)
Added ROW_RESULT to switchs(for documentation purposes) sql/filesort.cc: For documentation purposes sql/item_cmpfunc.cc: For documentation purposes sql/item_func.cc: For documentation purposes sql/item_sum.cc: For documentation purposes sql/log_event.cc: For documentation purposes sql/sql_lex.cc: For documentation purposes sql/sql_select.cc: For documentation purposes sql/sql_show.cc: Bug fix: for SHOW STATUS (when ssl is used)
This commit is contained in:
@ -251,6 +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);
|
||||
@ -910,6 +911,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);
|
||||
@ -1466,10 +1468,11 @@ bool udf_handler::get_arguments()
|
||||
to+= ALIGN_SIZE(sizeof(double));
|
||||
}
|
||||
break;
|
||||
case ROW_RESULT:
|
||||
default:
|
||||
// This case should never be choosen
|
||||
DBUG_ASSERT(0);
|
||||
;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
@ -1926,6 +1929,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);
|
||||
@ -2062,6 +2066,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);
|
||||
@ -2143,6 +2148,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);
|
||||
@ -2164,6 +2170,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);
|
||||
@ -2185,6 +2192,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);
|
||||
|
Reference in New Issue
Block a user