diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:32:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:38:34 +0200 |
| commit | cb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch) | |
| tree | 29d130592e3dfea50251771979fbaa6923d44ba9 /mysql-test/r/errors.result | |
| parent | a4885dde4ccec68bbb0268796f62e68e08ba4837 (diff) | |
| parent | 48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff) | |
| download | mariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'mysql-test/r/errors.result')
| -rw-r--r-- | mysql-test/r/errors.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/errors.result b/mysql-test/r/errors.result index 6e88ad00ad9..6d77a582fb8 100644 --- a/mysql-test/r/errors.result +++ b/mysql-test/r/errors.result @@ -172,7 +172,7 @@ UPDATE t1 SET a = 'new' WHERE COLUMN_CREATE( 1, 'v', 1, 'w' ) IS NULL; ERROR 22007: Illegal value used as argument of dynamic column function drop table t1; +set max_session_mem_used = 50000; +select * from seq_1_to_1000; set max_session_mem_used = 8192; select * from seq_1_to_1000; -Got one of the listed errors -set global max_session_mem_used = default; |