diff options
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 5cb4cd87296..d8ac571b578 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -382,7 +382,7 @@ void reset_mqh(LEX_USER *lu, bool get_them= 0) static const char mysql_system_user[]= "#mysql_system#"; // Returns 'user' if it's not NULL. Returns 'mysql_system_user' otherwise. -static const char * get_valid_user_string(char* user) +static const char * get_valid_user_string(const char* user) { return user ? user : mysql_system_user; } @@ -1108,7 +1108,7 @@ bool login_connection(THD *thd) /* Updates global user connection stats. */ if (increment_connection_count(thd, TRUE)) { - my_error(ER_OUTOFMEMORY, MYF(0), 2*sizeof(USER_STATS)); + my_error(ER_OUTOFMEMORY, MYF(0), (int) (2*sizeof(USER_STATS))); error= 1; goto exit; } |