summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysql.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-06-07 09:20:07 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-06-07 09:20:07 +0300
commit5a33a376825556a5187df10f09e709f18eaa7b32 (patch)
tree6bb213d68066670d7f30fa5d3ac588aae67cb04c /mysql-test/main/mysql.result
parentcd1de25912c0d004311cb6d947860e8242cc1499 (diff)
parent31fc2eb4bccee8ac3cc2fa26f73a491041e5efd4 (diff)
downloadmariadb-git-5a33a376825556a5187df10f09e709f18eaa7b32.tar.gz
Merge 10.8 into 10.9
Diffstat (limited to 'mysql-test/main/mysql.result')
-rw-r--r--mysql-test/main/mysql.result5
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/main/mysql.result b/mysql-test/main/mysql.result
index 70dde06600e..d889738bf6a 100644
--- a/mysql-test/main/mysql.result
+++ b/mysql-test/main/mysql.result
@@ -633,4 +633,7 @@ drop table t1;
#
# MDEV-15538 '-N' Produce html output wrong
#
-<TABLE BORDER=1><TR><TD>1</TD></TR></TABLE> \ No newline at end of file
+<TABLE BORDER=1><TR><TD>1</TD></TR></TABLE>
+WARNING: option '--enable-cleartext-plugin' is obsolete.
+1
+1