Fix for MDEV-15538, '-N' Produce html output wrong

MariaDB · Mar 21, 2019 · f00e25b · f00e25b
1 parent 0dd12b4
commit f00e25b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/client/mysql.cc b/client/mysql.cc
@@ -3754,9 +3754,10 @@ print_table_data_html(MYSQL_RES *result)
   MYSQL_FIELD	*field;
 
   mysql_field_seek(result,0);
-  (void) tee_fputs("<TABLE BORDER=1><TR>", PAGER);
+  (void) tee_fputs("<TABLE BORDER=1>", PAGER);
   if (column_names)
   {
+    (void) tee_fputs("<TR>", PAGER);
     while((field = mysql_fetch_field(result)))
     {
       tee_fputs("<TH>", PAGER);

diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
@@ -613,3 +613,7 @@ count(*)
 0
 truncate table t1;
 drop table t1;
+#
+# MDEV-15538 '-N' Produce html output wrong
+#
+<TABLE BORDER=1><TR><TD>1</TD></TR></TABLE>
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
@@ -678,3 +678,9 @@ select count(*) from t1; truncate table t1;
 --exec $MYSQL --disable-local-infile -e "/*q*/$ldli"
 select count(*) from t1; truncate table t1;
 drop table t1;
+
+
+--echo #
+--echo # MDEV-15538 '-N' Produce html output wrong
+--echo #
+--exec $MYSQL -NHe "select 1 as a"