diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 17:39:13 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-02 17:39:13 +0300 |
commit | 2f8d0af8837392e7116f624729860615a33d2484 (patch) | |
tree | afbf86fc085ff20bfb6426b655bce8a75ad1658a /mysql-test/main/mysql.result | |
parent | a61603562e09f230e5ab6540b16e1c623520f9b2 (diff) | |
parent | 22f935d6daa70a21a3f640261fcf8c9dfb259250 (diff) | |
download | mariadb-git-2f8d0af8837392e7116f624729860615a33d2484.tar.gz |
Merge 10.5 into 10.6
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 75b1a01ee4e..f2dec7fe1a4 100644 --- a/mysql-test/main/mysql.result +++ b/mysql-test/main/mysql.result @@ -629,4 +629,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 |