summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2014-03-07 13:21:16 +0100
committerSergey Petrunya <psergey@askmonty.org>2014-03-07 13:21:16 +0100
commit908fa69da929878e8a30eefee2e35856c1569058 (patch)
tree2559adfd9328a76abca66323832916741e6d1d9c
parent5ba109c4f6c180deef8e5d21c86fbf6b5d23e32f (diff)
downloadmariadb-git-908fa69da929878e8a30eefee2e35856c1569058.tar.gz
Bug #13571700 TINYBLOB NOT NULL, CRASH IN PROTOCOL::NET_STORE_DATA
- Backport testcase from mysql-5.6
-rw-r--r--mysql-test/r/select.result8
-rw-r--r--mysql-test/r/select_jcl6.result8
-rw-r--r--mysql-test/r/select_pkeycache.result8
-rw-r--r--mysql-test/t/select.test8
4 files changed, 32 insertions, 0 deletions
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 #