diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-23 16:42:05 +0300 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2009-12-23 16:42:05 +0300 |
| commit | af74c3436f5ba44606dc3ffcf501001711ed06d0 (patch) | |
| tree | 1552ff636d911fe038d671ee60e55406bdadbf35 /client/mysql.cc | |
| parent | d05c63f721c8aac027f5acab0339a86a4747be16 (diff) | |
| parent | d332a1895282aa7b3786b8116ad89d93db8ddd6a (diff) | |
| download | mariadb-git-af74c3436f5ba44606dc3ffcf501001711ed06d0.tar.gz | |
Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.
Conflicts:
Conflict adding files to server-tools. Created directory.
Conflict because server-tools is not versioned, but has versioned children. Versioned directory.
Conflict adding files to server-tools/instance-manager. Created directory.
Conflict because server-tools/instance-manager is not versioned, but has versioned children. Versioned directory.
Contents conflict in server-tools/instance-manager/instance_map.cc
Contents conflict in server-tools/instance-manager/listener.cc
Contents conflict in server-tools/instance-manager/options.cc
Contents conflict in server-tools/instance-manager/user_map.cc
Diffstat (limited to 'client/mysql.cc')
| -rw-r--r-- | client/mysql.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysql.cc b/client/mysql.cc index 548feb5a1c7..10e47c7edc7 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -3521,7 +3521,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; |