database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Backport fix for Bug #27884.

Browse Source
This commit is contained in:
Jim Winstead
2009-11-23 14:38:08 -08:00
parent cba6be7135
commit 531d32a5bb
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/mysql.cc
View File

@ -3387,9 +3387,12 @@ print_table_data_html(MYSQL_RES *result)
{ {
while((field = mysql_fetch_field(result))) while((field = mysql_fetch_field(result)))
{ {
tee_fprintf(PAGER, "<TH>%s</TH>", (field->name ? tee_fputs("<TH>", PAGER);
(field->name[0] ? field->name : if (field->name && field->name[0])
" &nbsp; ") : "NULL")); xmlencode_print(field->name, field->name_length);
else
tee_fputs(field->name ? " &nbsp; " : "NULL", PAGER);
tee_fputs("</TH>", PAGER);
} }
(void) tee_fputs("</TR>", PAGER); (void) tee_fputs("</TR>", PAGER);
} }
@ -3400,7 +3403,7 @@ print_table_data_html(MYSQL_RES *result)
for (uint i=0; i < mysql_num_fields(result); i++) for (uint i=0; i < mysql_num_fields(result); i++)
{ {
(void) tee_fputs("<TD>", PAGER); (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("</TD>", PAGER);
} }
(void) tee_fputs("</TR>", PAGER); (void) tee_fputs("</TR>", PAGER);

1
mysql-test/r/mysql.result
View File

@ -199,4 +199,5 @@ COUNT (*)
COUNT (*) COUNT (*)
1 1
ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno) 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 End of 5.0 tests

6
mysql-test/t/mysql.test
View File

@ -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 "CONNECT test invalid_hostname" 2>&1
--exec $MYSQL --default-character-set=binary test -e "DELIMITER //" 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 --echo End of 5.0 tests