=== modified file 'client/mysql.cc'
--- client/mysql.cc	2007-11-13 13:29:42 +0000
+++ client/mysql.cc	2008-05-01 19:16:09 +0000
@@ -2636,9 +2636,12 @@
   {
     while((field = mysql_fetch_field(result)))
     {
-      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 
-					 (field->name[0] ? field->name : 
-					  " &nbsp; ") : "NULL"));
+      tee_fputs("<TH>", PAGER);
+      if (field->name && field->name[0])
+        xmlencode_print(field->name, field->name_length);
+      else
+        tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
+      tee_fputs("</TH>", PAGER);
     }
     (void) tee_fputs("</TR>", PAGER);
   }
@@ -2651,7 +2654,7 @@
     for (uint i=0; i < mysql_num_fields(result); i++)
     {
       (void) tee_fputs("<TD>", PAGER);
-      safe_put_field(cur[i],lengths[i]);
+      xmlencode_print(cur[i], lengths[i]);
       (void) tee_fputs("</TD>", PAGER);
     }
     (void) tee_fputs("</TR>", PAGER);

=== modified file 'mysql-test/r/mysql.result'
--- mysql-test/r/mysql.result	2007-09-20 09:10:05 +0000
+++ mysql-test/r/mysql.result	2008-05-01 19:23:01 +0000
@@ -180,3 +180,5 @@
 1
 End of 5.0 tests
 WARNING: --server-arg option not supported in this configuration.
+<TABLE BORDER=1><TR><TH>&lt;</TH></TR><TR><TD>&lt; &amp; &gt;</TD></TR></TABLE>
+End of 5.1 tests

=== modified file 'mysql-test/t/mysql.test'
--- mysql-test/t/mysql.test	2007-09-04 22:50:09 +0000
+++ mysql-test/t/mysql.test	2008-05-01 19:22:54 +0000
@@ -290,3 +290,11 @@
 --disable_query_log
 --exec $MYSQL --server-arg=no-defaults test -e "quit"
 --enable_query_log
+
+#
+# Bug #27884: mysql --html does not quote HTML special characters in output
+# 
+--exec $MYSQL --html test -e "select '< & >' as \`<\`"
+
+--echo
+--echo End of 5.1 tests