diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 12:34:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 12:34:48 +0200 |
| commit | 19052b6debc1aeb4ef6ccbc36cdc92c10cf968b6 (patch) | |
| tree | 9eec011f81a7c4868283ed02b823771798fe45d4 /mysql-test/main/status2.result | |
| parent | eb7c5530eccb7d6782077e5562f5a471d2ccbc01 (diff) | |
| parent | c557e9540ab6058713a7c78dfa3df366ea92dd92 (diff) | |
| download | mariadb-git-19052b6debc1aeb4ef6ccbc36cdc92c10cf968b6.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'mysql-test/main/status2.result')
| -rw-r--r-- | mysql-test/main/status2.result | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/mysql-test/main/status2.result b/mysql-test/main/status2.result index fa0fc4e1061..60309e14fe3 100644 --- a/mysql-test/main/status2.result +++ b/mysql-test/main/status2.result @@ -74,4 +74,12 @@ DROP TRIGGER trigg1; DROP FUNCTION testQuestion; DROP EVENT ev1; DROP TABLE t1,t2; -End of 6.0 tests +# +# End of 5.5 tests +# +select variable_value < 1024*1024*1024 from information_schema.global_status where variable_name='memory_used'; +variable_value < 1024*1024*1024 +1 +# +# End of 10.2 tests +# |