summaryrefslogtreecommitdiff
path: root/mysql-test/r/func_misc.result
diff options
context:
space:
mode:
authorRamil Kalimullin <ramil@mysql.com>2010-10-13 08:51:37 +0400
committerRamil Kalimullin <ramil@mysql.com>2010-10-13 08:51:37 +0400
commitdcf23737104a0b387788fcd19e4cee5d92983ae2 (patch)
tree8e5e079794883d2845d703a8704db6751a1abb02 /mysql-test/r/func_misc.result
parent36966a2c9351965abd70aab86584441c55c6e5db (diff)
parentb001a5224d8b26e9706a386ca2c26320d152ee1c (diff)
downloadmariadb-git-dcf23737104a0b387788fcd19e4cee5d92983ae2.tar.gz
Merge.
Diffstat (limited to 'mysql-test/r/func_misc.result')
-rw-r--r--mysql-test/r/func_misc.result7
1 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/func_misc.result b/mysql-test/r/func_misc.result
index 85448a258e4..9ea02d5a9e3 100644
--- a/mysql-test/r/func_misc.result
+++ b/mysql-test/r/func_misc.result
@@ -375,4 +375,11 @@ 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 5.1 tests
+End of tests