diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-06 14:56:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-06 14:56:20 +0300 |
commit | 7e39470e337aeeab4ee3e73336c2fff88609529f (patch) | |
tree | a2bb0598aeb3e78efcc0cfc2509a22f951ee5447 /mysql-test/main/mysql.result | |
parent | 477776bfed892f3f7cadcef16e860a1232f59952 (diff) | |
parent | 4179f93d28035ea2798cb1c16feeaaef87ab4775 (diff) | |
download | mariadb-git-7e39470e337aeeab4ee3e73336c2fff88609529f.tar.gz |
Merge 10.6 into 10.7
Diffstat (limited to 'mysql-test/main/mysql.result')
-rw-r--r-- | mysql-test/main/mysql.result | 5 |
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 |