diff options
| author | Harin Vadodaria <harin.vadodaria@oracle.com> | 2012-06-19 13:54:31 +0530 |
|---|---|---|
| committer | Harin Vadodaria <harin.vadodaria@oracle.com> | 2012-06-19 13:54:31 +0530 |
| commit | 59b4c55b511ea7b1253fb2cf32c6459fbd6835a2 (patch) | |
| tree | 1ffdc732ba8adc673ce9698fecc0cc8a7d9057e7 /sql/sql_connect.cc | |
| parent | bd223999dcd20f67a087ba1dadeecd41a0c5622f (diff) | |
| parent | 61e428eb846e820ba0764932d1604859e53abe52 (diff) | |
| download | mariadb-git-59b4c55b511ea7b1253fb2cf32c6459fbd6835a2.tar.gz | |
Bug#11753779: MAX_CONNECT_ERRORS WORKS ONLY WHEN 1ST
INC_HOST_ERRORS() IS CALLED.
Description: Merge from MySQL 5.1 to MySQL 5.5
Reverting patch 3869 for bug#11753779
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index 14a1acdef5e..cdb0f5de049 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -499,19 +499,6 @@ static int check_connection(THD *thd) my_error(ER_BAD_HOST_ERROR, MYF(0)); return 1; } - /* BEGIN : DEBUG */ - DBUG_EXECUTE_IF("addr_fake_ipv4", - { - struct sockaddr *sa= (sockaddr *) &net->vio->remote; - sa->sa_family= AF_INET; - struct in_addr *ip4= &((struct sockaddr_in *)sa)->sin_addr; - /* See RFC 5737, 192.0.2.0/23 is reserved */ - const char* fake= "192.0.2.4"; - ip4->s_addr= inet_addr(fake); - strcpy(ip, fake); - };); - /* END : DEBUG */ - if (!(thd->main_security_ctx.ip= my_strdup(ip,MYF(MY_WME)))) return 1; /* The error is set by my_strdup(). */ thd->main_security_ctx.host_or_ip= thd->main_security_ctx.ip; |