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 | 930a08784c6bf32090d88783619a4c0485ce8cf9 (patch) | |
| tree | 1552ff636d911fe038d671ee60e55406bdadbf35 /mysql-test/r/mysql.result | |
| parent | 8933c6f5f431e06046a8c4f635ae2a366fbc8da8 (diff) | |
| parent | 27aba1b56914694ed8e5615f67dc397680842341 (diff) | |
| download | mariadb-git-930a08784c6bf32090d88783619a4c0485ce8cf9.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 'mysql-test/r/mysql.result')
| -rw-r--r-- | mysql-test/r/mysql.result | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/r/mysql.result b/mysql-test/r/mysql.result index 8debb3a9414..3482c2bab93 100644 --- a/mysql-test/r/mysql.result +++ b/mysql-test/r/mysql.result @@ -231,4 +231,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 |