merged

BitKeeper/deleted/.del-sort.c~e2e56b5a37ce86f4:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
myisam/ft_boolean_search.c:
  Auto merged
myisam/mi_packrec.c:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/r/fulltext.result:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.h:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
tests/client_test.c:
  Auto merged

1 files changed, 2 insertions, 3 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 9b707af6107..757521fe935 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -2436,8 +2436,7 @@ static const char *check_if_ignore_table(const char *table_name)
     fprintf(stderr,
 	    "Error: Couldn't read status information for table %s (%s)\n",
 	    table_name, mysql_error(sock));
-    if (res)
-      mysql_free_result(res);
+    mysql_free_result(res);
     return 0;					/* assume table is ok */
   }
   if (!(row[1]))
@@ -2448,7 +2447,7 @@ static const char *check_if_ignore_table(const char *table_name)
         strcmp(row[1], (result= "MRG_ISAM")))
       result= 0;
   }
-  mysql_free_result(res);  
+  mysql_free_result(res);
   return result;
 }