--- client/mysql.cc.orig       2008-08-28 11:39:27.000000000 -0400

+++ client/mysql.cc    2008-10-07 05:44:20.000000000 -0400

@@ -3372,9 +3372,12 @@

   {

     while((field = mysql_fetch_field(result)))

     {

-      tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? 

-                                       (field->name[0] ? field->name : 

-                                        "   ") : "NULL"));

+      tee_fputs("<TH>", PAGER);

+      if (field->name && field->name[0])

+      xmlencode_print(field->name, field->name_length);

+      else

+      tee_fputs(field->name ? "   " : "NULL", PAGER);

+      tee_fputs("</TH>", PAGER);

     }

     (void) tee_fputs("</TR>", PAGER);

   }

@@ -3387,7 +3390,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);

--- mysql-test/r/mysql.result.orig     2008-08-28 12:08:36.000000000 -0400

+++ mysql-test/r/mysql.result  2008-10-07 05:45:48.000000000 -0400

@@ -182,6 +182,8 @@

 This is a file starting with UTF8 BOM 0xEFBBBF

 End of 5.0 tests

 WARNING: --server-arg option not supported in this configuration.

<TABLE BORDER=1><TR><TH>&lt;a&gt;</TH></TR><TR><TD>&lt;a&gt;</TD></TR></TABLE>

+End of 5.1 tests

 Warning (Code 1286): Unknown table engine 'nonexistent'

 Warning (Code 1266): Using storage engine MyISAM for table 't2'

 Warning (Code 1286): Unknown table engine 'nonexistent2'

--- mysql-test/t/mysql.test.orig       2008-08-28 12:08:36.000000000 -0400

+++ mysql-test/t/mysql.test    2008-10-07 05:48:59.000000000 -0400

@@ -301,6 +301,14 @@

 --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

+

+#

 # Bug #25146: Some warnings/errors not shown when using --show-warnings

 #