mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge key cache structures to one
Fixed compiler warnings (IRIX C compiler and VC++)
This commit is contained in:
@@ -128,7 +128,7 @@ static int get_or_create_user_conn(THD *thd, const char *user,
|
||||
USER_RESOURCES *mqh)
|
||||
{
|
||||
int return_val=0;
|
||||
uint temp_len, user_len, host_len;
|
||||
uint temp_len, user_len;
|
||||
char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
|
||||
struct user_conn *uc;
|
||||
|
||||
@@ -136,7 +136,6 @@ static int get_or_create_user_conn(THD *thd, const char *user,
|
||||
DBUG_ASSERT(host != 0);
|
||||
|
||||
user_len=strlen(user);
|
||||
host_len=strlen(host);
|
||||
temp_len= (strmov(strmov(temp_user, user)+1, host) - temp_user)+1;
|
||||
(void) pthread_mutex_lock(&LOCK_user_conn);
|
||||
if (!(uc = (struct user_conn *) hash_search(&hash_user_connections,
|
||||
|
||||
Reference in New Issue
Block a user