client/mysqltest.c

    corrected number of fields for --enable_metadata
sql/sql_union.cc
    fixed a apparent typo in assert


client/mysqltest.c:
  corrected number of fields for --enable_metadata
mysql-test/r/metadata.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_1general.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_2myisam.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_3innodb.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_4heap.result:
  corrected number of fields for --enable_metadata
mysql-test/r/ps_5merge.result:
  corrected number of fields for --enable_metadata
mysql-test/r/type_enum.result:
  corrected number of fields for --enable_metadata
sql/sql_union.cc:
  fixed a apparent typo in assert

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 ;