From 908fa69da929878e8a30eefee2e35856c1569058 Mon Sep 17 00:00:00 2001
From: Sergey Petrunya <psergey@askmonty.org>
Date: Fri, 7 Mar 2014 13:21:16 +0100
Subject: [PATCH] Bug #13571700 TINYBLOB NOT NULL, CRASH IN
 PROTOCOL::NET_STORE_DATA - Backport testcase from mysql-5.6

---
 mysql-test/r/select.result           | 8 ++++++++
 mysql-test/r/select_jcl6.result      | 8 ++++++++
 mysql-test/r/select_pkeycache.result | 8 ++++++++
 mysql-test/t/select.test             | 8 ++++++++
 4 files changed, 32 insertions(+)

diff --git a/mysql-test/r/select.result b/mysql-test/r/select.result
index de32d00a4da..7219a9c4462 100644
--- a/mysql-test/r/select.result
+++ b/mysql-test/r/select.result
@@ -5328,6 +5328,14 @@ f1
 DROP TABLE t1;
 DROP VIEW view_t1;
 # End of test  BUG#63020
+#
+# Bug #13571700 TINYBLOB NOT NULL, CRASH IN PROTOCOL::NET_STORE_DATA
+#
+CREATE TABLE t1 (a TINYBLOB NOT NULL);
+SELECT a, COUNT(*) FROM t1 WHERE 0;
+a	COUNT(*)
+NULL	0
+DROP TABLE t1;
 SET optimizer_switch=@save_optimizer_switch;
 #
 # LP bug#994275 Assertion `real->type() == Item::FIELD_ITEM' failed
diff --git a/mysql-test/r/select_jcl6.result b/mysql-test/r/select_jcl6.result
index bc8339b7c50..3b51efa26b0 100644
--- a/mysql-test/r/select_jcl6.result
+++ b/mysql-test/r/select_jcl6.result
@@ -5339,6 +5339,14 @@ f1
 DROP TABLE t1;
 DROP VIEW view_t1;
 # End of test  BUG#63020
+#
+# Bug #13571700 TINYBLOB NOT NULL, CRASH IN PROTOCOL::NET_STORE_DATA
+#
+CREATE TABLE t1 (a TINYBLOB NOT NULL);
+SELECT a, COUNT(*) FROM t1 WHERE 0;
+a	COUNT(*)
+NULL	0
+DROP TABLE t1;
 SET optimizer_switch=@save_optimizer_switch;
 #
 # LP bug#994275 Assertion `real->type() == Item::FIELD_ITEM' failed
diff --git a/mysql-test/r/select_pkeycache.result b/mysql-test/r/select_pkeycache.result
index de32d00a4da..7219a9c4462 100644
--- a/mysql-test/r/select_pkeycache.result
+++ b/mysql-test/r/select_pkeycache.result
@@ -5328,6 +5328,14 @@ f1
 DROP TABLE t1;
 DROP VIEW view_t1;
 # End of test  BUG#63020
+#
+# Bug #13571700 TINYBLOB NOT NULL, CRASH IN PROTOCOL::NET_STORE_DATA
+#
+CREATE TABLE t1 (a TINYBLOB NOT NULL);
+SELECT a, COUNT(*) FROM t1 WHERE 0;
+a	COUNT(*)
+NULL	0
+DROP TABLE t1;
 SET optimizer_switch=@save_optimizer_switch;
 #
 # LP bug#994275 Assertion `real->type() == Item::FIELD_ITEM' failed
diff --git a/mysql-test/t/select.test b/mysql-test/t/select.test
index 7134a5c16cf..2d75dc48f73 100644
--- a/mysql-test/t/select.test
+++ b/mysql-test/t/select.test
@@ -4470,6 +4470,14 @@ DROP TABLE t1;
 DROP VIEW view_t1;
 --echo # End of test  BUG#63020
 
+--echo #
+--echo # Bug #13571700 TINYBLOB NOT NULL, CRASH IN PROTOCOL::NET_STORE_DATA
+--echo #
+
+CREATE TABLE t1 (a TINYBLOB NOT NULL);
+SELECT a, COUNT(*) FROM t1 WHERE 0;
+DROP TABLE t1;
+
 SET optimizer_switch=@save_optimizer_switch;
 
 --echo #