bzr push into mysql-5.5 branch (chuck.bell:3484)

[Chuck Bell]

 3484 Chuck Bell	2011-08-01 [merge]
      Merge with latest changes.

    modified:
      client/mysql_plugin.c
      mysql-test/r/mysql_plugin.result
      mysql-test/t/mysql_plugin.test
=== modified file 'client/mysql_plugin.c'
--- a/client/mysql_plugin.c	2011-08-01 15:19:56 +0000
+++ b/client/mysql_plugin.c	2011-08-01 18:39:24 +0000
@@ -551,10 +551,11 @@ static int search_dir(const char * base_
                       const char *subdir, char *tool_path)
 {
   char new_path[FN_REFLEN];
+  char source_path[FN_REFLEN];
 
-  strcpy(new_path, base_path);
-  strcat(new_path, subdir);
-  fn_format(new_path, new_path, "", tool_name, MY_UNPACK_FILENAME);
+  strcpy(source_path, base_path);
+  strcat(source_path, subdir);
+  fn_format(new_path, tool_name, source_path, "", MY_UNPACK_FILENAME);
   if (file_exists(new_path))
   {
     strcpy(tool_path, new_path);

No bundle (reason: useless for push emails).