summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2021-10-04 11:28:57 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2021-10-04 11:28:57 +0300
commitd836f8a50d62865024d5facebeacb9c491d57adb (patch)
tree4a1fa45921f6ffe60c37b6b7caf33e1a3b1377e6
parent333d6c30f87a7862a2d6ca379c49e2ea46451ebc (diff)
downloadmariadb-git-d836f8a50d62865024d5facebeacb9c491d57adb.tar.gz
Work around MDEV-26754 main.sp test fails for embedded server
-rw-r--r--mysql-test/main/sp.result3
-rw-r--r--mysql-test/main/sp.test3
2 files changed, 2 insertions, 4 deletions
diff --git a/mysql-test/main/sp.result b/mysql-test/main/sp.result
index 694c7bcd20e..3f14c9bec3e 100644
--- a/mysql-test/main/sp.result
+++ b/mysql-test/main/sp.result
@@ -8911,8 +8911,5 @@ SELECT 1 latin1 latin1_swedish_ci latin1_swedish_ci
SELECT VARIABLE_VALUE-@local_mem_used FROM INFORMATION_SCHEMA.SESSION_STATUS WHERE VARIABLE_NAME='MEMORY_USED';
VARIABLE_VALUE-@local_mem_used
0
-SELECT VARIABLE_VALUE-@global_mem_used FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='MEMORY_USED';
-VARIABLE_VALUE-@global_mem_used
-0
DROP PROCEDURE sp1;
# End of 10.3 tests
diff --git a/mysql-test/main/sp.test b/mysql-test/main/sp.test
index 50ae78c8431..b066f0d00ed 100644
--- a/mysql-test/main/sp.test
+++ b/mysql-test/main/sp.test
@@ -10446,6 +10446,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';
-SELECT VARIABLE_VALUE-@global_mem_used FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE VARIABLE_NAME='MEMORY_USED';
+# 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