Skip to content

Commit f00e25b

Browse files
chriscalendersvoj
authored andcommitted
Fix for MDEV-15538, '-N' Produce html output wrong
1 parent 0dd12b4 commit f00e25b

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

client/mysql.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3754,9 +3754,10 @@ print_table_data_html(MYSQL_RES *result)
37543754
MYSQL_FIELD *field;
37553755

37563756
mysql_field_seek(result,0);
3757-
(void) tee_fputs("<TABLE BORDER=1><TR>", PAGER);
3757+
(void) tee_fputs("<TABLE BORDER=1>", PAGER);
37583758
if (column_names)
37593759
{
3760+
(void) tee_fputs("<TR>", PAGER);
37603761
while((field = mysql_fetch_field(result)))
37613762
{
37623763
tee_fputs("<TH>", PAGER);

mysql-test/r/mysql.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,3 +613,7 @@ count(*)
613613
0
614614
truncate table t1;
615615
drop table t1;
616+
#
617+
# MDEV-15538 '-N' Produce html output wrong
618+
#
619+
<TABLE BORDER=1><TR><TD>1</TD></TR></TABLE>

mysql-test/t/mysql.test

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,3 +678,9 @@ select count(*) from t1; truncate table t1;
678678
--exec $MYSQL --disable-local-infile -e "/*q*/$ldli"
679679
select count(*) from t1; truncate table t1;
680680
drop table t1;
681+
682+
683+
--echo #
684+
--echo # MDEV-15538 '-N' Produce html output wrong
685+
--echo #
686+
--exec $MYSQL -NHe "select 1 as a"

0 commit comments

Comments
 (0)