summaryrefslogtreecommitdiff
path: root/mysql-test/suite/sys_vars/r
diff options
context:
space:
mode:
authorDaniel Black <daniel@mariadb.org>2022-04-21 14:48:13 +1000
committerDaniel Black <daniel@mariadb.org>2022-04-21 15:47:03 +1000
commit580cbd18b38b1104da49b6eb4f1c10954d6ae183 (patch)
treedb93c6da0cb3a7a5797eefc356114fe948781a3e /mysql-test/suite/sys_vars/r
parenta9adfc0f68f0741f8d924eb5ba7fa440aad69213 (diff)
parentd7189fbcb4dadf23d615a5f3a26aba1d4e37178f (diff)
downloadmariadb-git-580cbd18b38b1104da49b6eb4f1c10954d6ae183.tar.gz
Merge branch 10.4 into 10.5
A few of constaint -> constraint
Diffstat (limited to 'mysql-test/suite/sys_vars/r')
-rw-r--r--mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result12
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result b/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result
index 0acf8428100..81453d72274 100644
--- a/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result
+++ b/mysql-test/suite/sys_vars/r/tmp_disk_table_size_basic.result
@@ -142,5 +142,17 @@ SELECT global.tmp_disk_table_size;
ERROR 42S02: Unknown table 'global' in field list
SELECT tmp_disk_table_size = @@session.tmp_disk_table_size;
ERROR 42S22: Unknown column 'tmp_disk_table_size' in 'field list'
+#
+# Beginning of 10.4 test
+#
+# Diagnostics_area::sql_errno() const: Assertion `m_status == DA_ERROR'
+# failed on SELECT after setting tmp_disk_table_size.
+#
+SET @@tmp_disk_table_size=16384;
+CREATE VIEW v AS SELECT 'a';
+SELECT table_name FROM INFORMATION_SCHEMA.views;
+ERROR HY000: The table '(temporary)' is full
+DROP VIEW v;
+# End of 10.4 test
SET @@global.tmp_disk_table_size = @start_global_value;
SET @@session.tmp_disk_table_size = @start_session_value;