diff options
author | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-03-26 19:49:24 +0100 |
commit | 68717638d572dac02b82511809d3b5f9023c0872 (patch) | |
tree | 5bb56d7c3d40836dcfebc8a965a7fc7eab54177b /client | |
parent | 3fd639493aea5c340acc2e28617e8d917d54ff7d (diff) | |
parent | b18f2c2a89d3896873a2df20e443a6a0b953cccf (diff) | |
download | mariadb-git-68717638d572dac02b82511809d3b5f9023c0872.tar.gz |
Merge serg@bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
acinclude.m4:
Auto merged
mysql-test/r/ps_1general.result:
Auto merged
Diffstat (limited to 'client')
-rw-r--r-- | client/mysqltest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 042f84dfb9e..2e939af2f13 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -3046,7 +3046,7 @@ static void run_query_display_metadata(MYSQL_FIELD *field, uint num_fields, { MYSQL_FIELD *field_end; dynstr_append(ds,"Catalog\tDatabase\tTable\tTable_alias\tColumn\t" - "Column_alias\tName\tType\tLength\tMax length\tIs_null\t" + "Column_alias\tType\tLength\tMax length\tIs_null\t" "Flags\tDecimals\tCharsetnr\n"); for (field_end= field+num_fields ; |