From b001a5224d8b26e9706a386ca2c26320d152ee1c Mon Sep 17 00:00:00 2001
From: Ramil Kalimullin <ramil@mysql.com>
Date: Tue, 12 Oct 2010 23:28:03 +0400
Subject: [PATCH] Fix for bug#57283: inet_ntoa() crashes

Problem: some call of INET_NTOA() function may lead
to a crash due to missing its character set initialization.

Fix: explicitly set the character set.


mysql-test/r/func_misc.result:
  Fix for bug#57283: inet_ntoa() crashes
    - test result.
mysql-test/t/func_misc.test:
  Fix for bug#57283: inet_ntoa() crashes
    - test case.
sql/item_strfunc.cc:
  Fix for bug#57283: inet_ntoa() crashes
    - explicitly set buffer's character set.
---
 mysql-test/r/func_misc.result | 6 ++++++
 mysql-test/t/func_misc.test   | 8 ++++++++
 sql/item_strfunc.cc           | 1 +
 3 files changed, 15 insertions(+)

diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index eee56ae7461..082b6eb50c2 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -351,4 +351,10 @@ GREATEST(a, (SELECT b FROM t1 LIMIT 1))
 3
 1
 DROP TABLE t1;
+SELECT INET_NTOA(0);
+INET_NTOA(0)
+0.0.0.0
+SELECT '1' IN ('1', INET_NTOA(0));
+'1' IN ('1', INET_NTOA(0))
+1
 End of tests
diff --git a/mysql-test/t/func_misc.test b/mysql-test/t/func_misc.test
index c6b5ffd5a3f..f47418fa773 100644
--- a/mysql-test/t/func_misc.test
+++ b/mysql-test/t/func_misc.test
@@ -479,4 +479,12 @@ SELECT DISTINCT GREATEST(a, (SELECT b FROM t1 LIMIT 1)) FROM t1 UNION SELECT 1;
 
 DROP TABLE t1;
 
+
+#
+# Bug #57283: inet_ntoa() crashes
+#
+SELECT INET_NTOA(0);
+SELECT '1' IN ('1', INET_NTOA(0));
+
+
 --echo End of tests
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc
index 9f06a4b5c9f..8fda281bd9e 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -3135,6 +3135,7 @@ String* Item_func_inet_ntoa::val_str(String* str)
   if ((null_value= (args[0]->null_value || n > (ulonglong) LL(4294967295))))
     return 0;					// Null value
 
+  str->set_charset(collation.collation);
   str->length(0);
   int4store(buf,n);