database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Sergei Golubchik
2015-06-11 20:20:35 +02:00
parent a99efc00a6 d199a0ffb0
commit 810cf362ea
165 changed files with 3364 additions and 1399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_connect.cc
View File

@ -1122,7 +1122,7 @@ bool setup_connection_thread_globals(THD *thd)
bool login_connection(THD *thd)
{
NET *net= &thd->net;
int error;
int error= 0;
DBUG_ENTER("login_connection");
DBUG_PRINT("info", ("login_connection called by thread %lu",
thd->thread_id));
@ -1141,7 +1141,8 @@ bool login_connection(THD *thd)
my_sleep(1000); /* must wait after eof() */
#endif
statistic_increment(aborted_connects,&LOCK_status);
DBUG_RETURN(1);
error=1;
goto exit;
}
/* Connect completed, set read/write timeouts back to default */
my_net_set_read_timeout(net, thd->variables.net_read_timeout);
@ -1151,10 +1152,13 @@ bool login_connection(THD *thd)
if (increment_connection_count(thd, TRUE))
{
my_error(ER_OUTOFMEMORY, MYF(0), 2*sizeof(USER_STATS));
DBUG_RETURN(1);
error= 1;
goto exit;
}
DBUG_RETURN(0);
exit:
mysql_audit_notify_connection_connect(thd);
DBUG_RETURN(error);
}
@ -1295,7 +1299,6 @@ bool thd_prepare_connection(THD *thd)
bool rc;
lex_start(thd);
rc= login_connection(thd);
mysql_audit_notify_connection_connect(thd);
if (rc)
return rc;