From 33d298493df7659f17c7825ee17ecb068402d29a Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 4 Mar 2016 10:13:41 +0100
Subject: [PATCH] MDEV-9683 Server crashes in Item::basic_const_item on
 numerous nested NULLIFs

test case only
---
 mysql-test/r/null.result |  5 +++++
 mysql-test/t/null.test   | 10 ++++++++++
 2 files changed, 15 insertions(+)

diff --git a/mysql-test/r/null.result b/mysql-test/r/null.result
index f321ac978f5..3da7e4805c2 100644
--- a/mysql-test/r/null.result
+++ b/mysql-test/r/null.result
@@ -1566,6 +1566,11 @@ f1
 EXECUTE stmt;
 f1
 DROP TABLE t1;
+CREATE TABLE t1 (i INT);
+INSERT INTO t1 VALUES (1),(2);
+SELECT * FROM t1 WHERE NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(i = ROUND(0), 14), 13), 12), 11), 10), 9), 8), 7), 6), 5), 4), 3), 2), 1);
+i
+DROP TABLE t1;
 #
 # End of 10.1 tests
 #
diff --git a/mysql-test/t/null.test b/mysql-test/t/null.test
index cdc9ceb27e0..a5db4442183 100644
--- a/mysql-test/t/null.test
+++ b/mysql-test/t/null.test
@@ -997,6 +997,16 @@ PREPARE stmt FROM "SELECT * FROM t1 WHERE NULLIF( ( 1, 2 ) IN ( SELECT 3, 4 ), 1
 EXECUTE stmt;
 EXECUTE stmt;
 DROP TABLE t1;
+
+#
+# MDEV-9683 Server crashes in Item::basic_const_item on numerous nested NULLIFs
+#
+CREATE TABLE t1 (i INT);
+INSERT INTO t1 VALUES (1),(2);
+SELECT * FROM t1 WHERE NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(NULLIF(i = ROUND(0), 14), 13), 12), 11), 10), 9), 8), 7), 6), 5), 4), 3), 2), 1);
+DROP TABLE t1;
+
+
 --echo #
 --echo # End of 10.1 tests
 --echo #