bzr push into mysql-5.0 branch (davi:2656 to 2657)

[Davi Arnaut]

 2657 Davi Arnaut	2008-08-11
      Post-merge fix: Silence warning due to type mismatch.
modified:
  client/mysql_upgrade.c

 2656 Kristofer Pettersson	2008-08-11 [merge]
      Automerge
modified:
  sql/sql_cursor.cc
  tests/mysql_client_test.c

=== modified file 'client/mysql_upgrade.c'
--- a/client/mysql_upgrade.c	2008-08-07 16:24:39 +0000
+++ b/client/mysql_upgrade.c	2008-08-11 13:08:21 +0000
@@ -364,7 +364,9 @@ static void find_tool(char *tool_executa
   }
   else
   {
-    /* 
+    int len;
+
+    /*
       mysql_upgrade was run absolutely or relatively.  We can find a sibling
       by replacing our name after the LIBCHAR with the new tool name.
     */
@@ -385,10 +387,10 @@ static void find_tool(char *tool_executa
       last_fn_libchar -= 6;
     }
 
+    len= last_fn_libchar - self_name;
+
     my_snprintf(tool_executable_name, FN_REFLEN, "%.*s%c%s",
-             (last_fn_libchar - self_name), self_name, 
-             FN_LIBCHAR,
-             tool_name);
+                len, self_name, FN_LIBCHAR, tool_name);
   }
 
   verbose("Looking for '%s' as: %s", tool_name, tool_executable_name);