bzr push into mysql-5.5 branch (chuck.bell:3488 to 3489) WL#5710

[Chuck Bell]

 3489 Chuck Bell	2011-08-05
      WL#5710 : enable and disable plugins. More test diagnostics.

    modified:
      mysql-test/t/mysql_plugin.test
 3488 Saikumar V	2011-08-05
      Patch for plugin_dir and error_msg file.

    modified:
      mysql-test/t/mysql_plugin.test
=== modified file 'mysql-test/t/mysql_plugin.test'
--- a/mysql-test/t/mysql_plugin.test	2011-08-05 16:41:26 +0000
+++ b/mysql-test/t/mysql_plugin.test	2011-08-05 20:50:09 +0000
@@ -25,6 +25,7 @@ use File::Basename;
   my $my_print_defaults= $ENV{MYSQL_MY_PRINT_DEFAULTS};
   my $my_print_defaults_basedir=dirname($my_print_defaults);
   my $daemonexample_ini= "$ENV{DAEMONEXAMPLE_DIR}/daemon_example.ini";
+  my $plugindir_ini= "$ENV{PLUGIN_DIR}/daemon_example.ini";
   my $notfound= "";
   open(FILE, ">", "$ENV{MYSQL_TMP_DIR}/mysqld.inc") or die;
   print FILE "let \$MYSQLD= $mysqld;\n";
@@ -34,6 +35,10 @@ use File::Basename;
   {
     print FILE "let \$DAEMONEXAMPLE_DIR= $not_found;\n";
   }
+  if ((!-e $plugindir_ini) || (!-r $plugindir_ini))
+  {
+    print FILE "let \$PLUGIN_DIR= $not_found;\n";
+  }
   close FILE;
 EOF
 
@@ -66,10 +71,15 @@ if ($MYSQLD == '')
   --skip Test requires known location of mysqld executable.
 }
 
-# Check for daemon_example.ini location. Skip if not found.
+# Check for daemon_example.ini location. Skip if not found in either
+# the plugin_dir path or the daemon_example_dir path.
 if ($PLUGIN_DIR == '')
 {
-  --skip Test requires known location of daemon_example.ini file.
+  if ($DAEMONEXAMPLE_DIR == '')
+  {
+    --skip Test requires known location of daemon_example.ini file.  
+  }
+  let $PLUGIN_DIR = $DAEMONEXAMPLE_DIR;
 }
 
 let $MYSQLD_BOOTSTRAP_CMD= $MYSQL_PLUGIN --datadir=$MYSQLD_DATADIR --basedir=$MYSQLD_BASEDIR --plugin-dir=$PLUGIN_DIR --mysqld=$MYSQLD --my-print-defaults=$MYSQL_MY_PRINT_DEFAULTS_BASEDIR;

No bundle (reason: useless for push emails).