summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--client/mysql.cc3
-rw-r--r--mysql-test/r/mysql.result8
-rw-r--r--mysql-test/t/mysql.test7
3 files changed, 15 insertions, 3 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 9d078153a33..5e5d056d6d9 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -3524,7 +3524,8 @@ print_table_data_vertically(MYSQL_RES *result)
for (uint off=0; off < mysql_num_fields(result); off++)
{
field= mysql_fetch_field(result);
- tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name);
+ if (column_names)
+ tee_fprintf(PAGER, "%*s: ",(int) max_length,field->name);
if (cur[off])
{
unsigned int i;
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result
index 5c6a0e2f93d..68f30ed80f8 100644
--- a/mysql-test/r/mysql.result
+++ b/mysql-test/r/mysql.result
@@ -229,4 +229,10 @@ a: b
</row>
</resultset>
drop table t1;
-End of 5.0 tests
+
+Bug #47147: mysql client option --skip-column-names does not apply to vertical output
+
+*************************** 1. row ***************************
+1
+
+End of tests
diff --git a/mysql-test/t/mysql.test b/mysql-test/t/mysql.test
index 7e28358ba8b..d32d0996490 100644
--- a/mysql-test/t/mysql.test
+++ b/mysql-test/t/mysql.test
@@ -407,5 +407,10 @@ insert into t1 values ('\0b\0');
--exec $MYSQL --xml test -e "select a from t1"
drop table t1;
+--echo
+--echo Bug #47147: mysql client option --skip-column-names does not apply to vertical output
+--echo
+--exec $MYSQL --skip-column-names --vertical test -e "select 1 as a"
---echo End of 5.0 tests
+--echo
+--echo End of tests