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, 6 insertions, 5 deletions

diff --git a/sql/slave.cc b/sql/slave.cc
index 5332dbf9c5b..0c5ebe0744a 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -2610,18 +2610,19 @@ int st_relay_log_info::wait_for_pos(THD* thd, String* log_name,
   init_abort_pos_wait= abort_pos_wait;
 
   /*
-    We'll need to 
+    We'll need to
     handle all possible log names comparisons (e.g. 999 vs 1000).
-    We use ulong for string->number conversion ; this is no 
+    We use ulong for string->number conversion ; this is no
     stronger limitation than in find_uniq_filename in sql/log.cc
   */
   ulong log_name_extension;
   char log_name_tmp[FN_REFLEN]; //make a char[] from String
-  char *end= strmake(log_name_tmp, log_name->ptr(), min(log_name->length(),
-							FN_REFLEN-1));
+
+  strmake(log_name_tmp, log_name->ptr(), min(log_name->length(), FN_REFLEN-1));
+
   char *p= fn_ext(log_name_tmp);
   char *p_end;
-  if (!*p || log_pos<0)   
+  if (!*p || log_pos<0)
   {
     error= -2; //means improper arguments
     goto err;