diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-05 09:21:34 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-05 09:21:34 +0300 |
commit | 4ca56e8348c7bd20cb7544a607b730d6038746b6 (patch) | |
tree | d2f5de2baa27f1c8e05464ded94eff559e1f58c4 /mysql-test/main | |
parent | 668a5f3d122ef3c935bf365d8084fb9713f44c60 (diff) | |
parent | df94aa344b8dd219d6afbec502b53505385e495b (diff) | |
download | mariadb-git-4ca56e8348c7bd20cb7544a607b730d6038746b6.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main')
-rw-r--r-- | mysql-test/main/sp.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test index b1c69faa83a..9e4166b42c1 100644 --- a/mysql-test/main/sp.test +++ b/mysql-test/main/sp.test @@ -10432,7 +10432,7 @@ SELECT VARIABLE_VALUE into @local_mem_used FROM INFORMATION_SCHEMA.SESSION_STATU CREATE PROCEDURE sp1() SELECT 1; SHOW CREATE PROCEDURE sp1; SELECT VARIABLE_VALUE-@local_mem_used FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='MEMORY_USED'; -# 10.5 FIXME: This occasionally shows 56 or 64 bytes of difference! +# FIXME: MDEV-26754 main.sp test fails for embedded server #SELECT VARIABLE_VALUE-@global_mem_used FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='MEMORY_USED'; DROP PROCEDURE sp1; --echo # End of 10.3 tests |