Commit e498d326 authored by Alexander Barkov's avatar Alexander Barkov

Adding "const" qualifier to arguments of date2my_decimal()

and ErrConvString::ErrConvString(String *).
parent bdc03e05
......@@ -320,7 +320,7 @@ my_decimal *seconds2my_decimal(bool sign,
}
my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec)
my_decimal *date2my_decimal(const MYSQL_TIME *ltime, my_decimal *dec)
{
longlong date= (ltime->year*100L + ltime->month)*100L + ltime->day;
if (ltime->time_type > MYSQL_TIMESTAMP_DATE)
......
......@@ -386,7 +386,7 @@ int string2my_decimal(uint mask, const String *str, my_decimal *d)
}
my_decimal *date2my_decimal(MYSQL_TIME *ltime, my_decimal *dec);
my_decimal *date2my_decimal(const MYSQL_TIME *ltime, my_decimal *dec);
#endif /*defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY) */
......
......@@ -567,7 +567,7 @@ class ErrConvString : public ErrConv
: ErrConv(), str(str_arg), len(len_arg), cs(cs_arg) {}
ErrConvString(const char *str_arg, CHARSET_INFO *cs_arg)
: ErrConv(), str(str_arg), len(strlen(str_arg)), cs(cs_arg) {}
ErrConvString(String *s)
ErrConvString(const String *s)
: ErrConv(), str(s->ptr()), len(s->length()), cs(s->charset()) {}
const char *ptr() const
{ return err_conv(err_buffer, sizeof(err_buffer), str, len, cs); }
......
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