database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into deer.(none):/home/hf/work/mysql-4.1-w1284
This commit is contained in:
hf@deer.(none)
2003-11-26 13:39:18 +04:00
parent 611096a709 b99377f3d2
commit 3e9338f845
204 changed files with 3510 additions and 1715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_parse.cc
View File

@@ -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,
@@ -2717,7 +2716,7 @@ mysql_execute_command(THD *thd)
(ORDER *)NULL,
select_lex->options | thd->options |
SELECT_NO_JOIN_CACHE | SELECT_NO_UNLOCK,
result, unit, select_lex, 0);
result, unit, select_lex);
if (thd->net.report_error)
res= -1;
delete result;