summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorJim Winstead <jimw@mysql.com>2009-11-23 14:38:08 -0800
committerJim Winstead <jimw@mysql.com>2009-11-23 14:38:08 -0800
commit84c5abbd33856ba730b1e9091146d986f1923bfa (patch)
treea8272ba94c1daf15a03b9e1aefeae654d8d7bddd /mysql-test
parent67801696130fb554217fb16f292336736e9ea607 (diff)
downloadmariadb-git-84c5abbd33856ba730b1e9091146d986f1923bfa.tar.gz
Backport fix for Bug #27884.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysql.result1
-rw-r--r--mysql-test/t/mysql.test6
2 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 4affd884753..1945f893f04 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -199,4 +199,5 @@ COUNT (*)
COUNT (*)
1
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+<TABLE BORDER=1><TR><TH>&lt;</TH></TR><TR><TD>&lt; &amp; &gt;</TD></TR></TABLE>
End of 5.0 tests
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index b2d7400d156..0cdb0ddb653 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -356,4 +356,10 @@ remove_file $MYSQLTEST_VARDIR/tmp/bug31060.sql;
--exec $MYSQL --default-character-set=binary test -e "CONNECT test invalid_hostname" 2>&1
--exec $MYSQL --default-character-set=binary test -e "DELIMITER //" 2>&1
+#
+# Bug #27884: mysql --html does not quote HTML special characters in output
+#
+--exec $MYSQL --html test -e "select '< & >' as \`<\`"
+--echo
+
--echo End of 5.0 tests