summaryrefslogtreecommitdiff
path: root/mysql-test/main/myisam.result
diff options
context:
space:
mode:
authorVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 12:41:19 +0300
committerVicențiu Ciorbaru <vicentiu@mariadb.org>2018-04-12 12:41:19 +0300
commit65eefcdc601ef0f57b0779f1722161fc83a571c3 (patch)
tree7fe642e7d6e685ed87fbd292d986b871b5e0a720 /mysql-test/main/myisam.result
parent9c42b9038dc1457fd4aeed0520bc143a043a84d9 (diff)
parent36c01167200cf29ac92f3bd3263d7757c55cbb89 (diff)
downloadmariadb-git-65eefcdc601ef0f57b0779f1722161fc83a571c3.tar.gz
Merge remote-tracking branch '10.2' into 10.3
Diffstat (limited to 'mysql-test/main/myisam.result')
-rw-r--r--mysql-test/main/myisam.result7
1 files changed, 4 insertions, 3 deletions
diff --git a/mysql-test/main/myisam.result b/mysql-test/main/myisam.result
index cbc475cfd8a..4864ef0bb13 100644
--- a/mysql-test/main/myisam.result
+++ b/mysql-test/main/myisam.result
@@ -1938,16 +1938,17 @@ DROP TABLE t1;
#
# BUG#48438 - crash with error in unioned query against merge table and view...
#
-SET GLOBAL table_open_cache=3;
+SET @save_table_open_cache=@@table_open_cache;
+SET GLOBAL table_open_cache=10;
CREATE TABLE t1(a INT);
-SELECT 1 FROM t1 AS a1, t1 AS a2, t1 AS a3, t1 AS a4 FOR UPDATE;
+SELECT 1 FROM t1 AS a1, t1 AS a2, t1 AS a3, t1 AS a4, t1 AS a5, t1 AS a6, t1 AS a7, t1 AS a8, t1 AS a9, t1 AS a10, t1 AS a11 FOR UPDATE;
1
SELECT TABLE_ROWS, DATA_LENGTH FROM INFORMATION_SCHEMA.TABLES
WHERE TABLE_SCHEMA='test' AND TABLE_NAME='t1';
TABLE_ROWS DATA_LENGTH
0 0
DROP TABLE t1;
-SET GLOBAL table_open_cache=DEFAULT;
+SET GLOBAL table_open_cache=@save_table_open_cache;
End of 5.0 tests
create table t1 (a int not null, key `a` (a) key_block_size=1024);
show create table t1;