summaryrefslogtreecommitdiff
path: root/sql/sql_connect.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2013-01-10 15:40:21 +0100
committerSergei Golubchik <sergii@pisem.net>2013-01-10 15:40:21 +0100
commit4f67a14700c0266c58b05be0dbd8fc10f88464a6 (patch)
tree568cd8f2997888d5c1035ad8e9b5e823197dcf62 /sql/sql_connect.cc
parentb0ee31c89480519490537b89dca1e8cc65e2b73b (diff)
parentbd87fed1dc0caa0720e5a60f0fca1b714c58ac75 (diff)
downloadmariadb-git-4f67a14700c0266c58b05be0dbd8fc10f88464a6.tar.gz
5.2->5.3 merge
Diffstat (limited to 'sql/sql_connect.cc')
-rw-r--r--sql/sql_connect.cc13
1 files changed, 13 insertions, 0 deletions
diff --git a/sql/sql_connect.cc b/sql/sql_connect.cc
index b09e19a6f4f..89df1835704 100644
--- a/sql/sql_connect.cc
+++ b/sql/sql_connect.cc
@@ -889,6 +889,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;