diff options
| author | chriscalender <chriscalender@gmail.com> | 2019-02-10 15:48:12 -0500 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-03-22 01:01:59 +0400 |
| commit | f00e25b4c4dee75d0bc3d8f3027ff1e9c8c5368b (patch) | |
| tree | d09dc79564388f5c0957d7a8ce2e6a41d41f959a | |
| parent | 0dd12b4f2a72245a0fb491685c172a7b0e48cbc5 (diff) | |
| download | mariadb-git-f00e25b4c4dee75d0bc3d8f3027ff1e9c8c5368b.tar.gz | |
Fix for MDEV-15538, '-N' Produce html output wrong
| -rw-r--r-- | client/mysql.cc | 3 | ||||
| -rw-r--r-- | mysql-test/r/mysql.result | 4 | ||||
| -rw-r--r-- | mysql-test/t/mysql.test | 6 |
3 files changed, 12 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 624e97236aa..e035d15d809 100644 --- 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 index ffa5d020153..d23c7965af4 100644 --- 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>
\ No newline at end of file diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test index f526a3fea91..54033606b53 100644 --- 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" |