diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 18:01:41 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-22 18:01:41 +0300 |
| commit | b46cf33ab8ce869af0f51c35026965d237d722c7 (patch) | |
| tree | 2c89cb26f83f47424279f2535fbc8eddd6f09d38 /mysql-test/main/truncate_notembedded.result | |
| parent | 9fc1ef932f0b7499724cfcf76bd0f298f135018f (diff) | |
| parent | 1cb218c37cc3fe01a1ff2fe9b1cbfb591e90d5ce (diff) | |
| download | mariadb-git-b46cf33ab8ce869af0f51c35026965d237d722c7.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/truncate_notembedded.result')
| -rw-r--r-- | mysql-test/main/truncate_notembedded.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/main/truncate_notembedded.result b/mysql-test/main/truncate_notembedded.result index 18a01c684e7..dabd5474141 100644 --- a/mysql-test/main/truncate_notembedded.result +++ b/mysql-test/main/truncate_notembedded.result @@ -5,7 +5,7 @@ CREATE TABLE t1 (a INT) ENGINE=MyISAM; LOCK TABLE t1 READ; connect con1,localhost,root,,test; -SET SESSION max_session_mem_used= 65536; +SET SESSION max_session_mem_used= 45500; LOCK TABLE t1 WRITE; connection default; SELECT * FROM t1; @@ -13,7 +13,7 @@ a UNLOCK TABLES; connection con1; TRUNCATE TABLE t1; -ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=65536 option so it cannot execute this statement +ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=45500 option so it cannot execute this statement disconnect con1; connection default; DROP TABLE t1; |