summaryrefslogtreecommitdiff
path: root/mysql-test/main/plugin.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-02-22 12:12:49 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2022-02-22 12:12:49 +0200
commit92f79a22e63a3fef71106c64dfd8559ee9bdda4a (patch)
tree5d83cdcf964805192546fd8bfdef999f5444e58d /mysql-test/main/plugin.result
parent120480d15b764d03d5d36fb68735a1975ceb3454 (diff)
parenta112a80b4762dbb80b25ae0e8bcd93893eacec5f (diff)
downloadmariadb-git-92f79a22e63a3fef71106c64dfd8559ee9bdda4a.tar.gz
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/main/plugin.result')
-rw-r--r--mysql-test/main/plugin.result4
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/main/plugin.result b/mysql-test/main/plugin.result
index 2f848309c48..903c9bd8ccf 100644
--- a/mysql-test/main/plugin.result
+++ b/mysql-test/main/plugin.result
@@ -40,11 +40,15 @@ a
set global example_ulong_var=500;
set global example_enum_var= e1;
set session example_int_var= -1;
+set global example_deprecated_var=1;
+Warnings:
+Warning 1287 '@@example_deprecated_var' is deprecated and will be removed in a future release
show status like 'example%';
Variable_name Value
Example_func_example enum_var is 0, ulong_var is 500, int_var is -1, double_var is 8.500000, really
show variables like 'example%';
Variable_name Value
+example_deprecated_var 0
example_double_thdvar 8.500000
example_double_var 8.500000
example_enum_var e1