diff options
| author | Harin Vadodaria <harin.vadodaria@oracle.com> | 2012-09-17 17:06:18 +0530 |
|---|---|---|
| committer | Harin Vadodaria <harin.vadodaria@oracle.com> | 2012-09-17 17:06:18 +0530 |
| commit | 61f88b697f1746ab2308d5ed793e71111df76451 (patch) | |
| tree | 2e060e985e18b5f8f87a7bfc8aa29be5cb82c63d /sql/sql_connect.cc | |
| parent | 8d5c44c9dd7c833c6abf37f753d1b64532af0459 (diff) | |
| parent | 9d007e075d6b933df9dbd1a42d52ab00ee91827c (diff) | |
| download | mariadb-git-61f88b697f1746ab2308d5ed793e71111df76451.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
Diffstat (limited to 'sql/sql_connect.cc')
| -rw-r--r-- | sql/sql_connect.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc index cdb0f5de049..14a1acdef5e 100644 --- a/sql/sql_connect.cc +++ b/sql/sql_connect.cc @@ -499,6 +499,19 @@ 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; |