List:Commits« Previous MessageNext Message »
From:Bjorn Munch Date:May 27 2011 11:46am
Subject:Re: bzr commit into mysql-5.5 branch (chuck.bell:3409) WL#5710
View as plain text  
On 26/05 19.25, chuck.bell@stripped wrote:
> #At file:///Users/cbell/source/bzr/mysql-wl-5710/ based on
> revid:sven.sandberg@stripped
> 
>  3409 chuck.bell@stripped	2011-05-26
>       WL#5710 : mysql_plugin - enable or disable plugins
>       
> === modified file 'mysql-test/mysql-test-run.pl'
> --- a/mysql-test/mysql-test-run.pl	2011-05-25 14:07:16 +0000
> +++ b/mysql-test/mysql-test-run.pl	2011-05-26 19:25:47 +0000
> @@ -168,6 +168,7 @@ my $opt_suites;
>  
>  our $opt_verbose= 0;  # Verbose output, enable with --verbose
>  our $exe_mysql;
> +our $exe_mysql_plugin;
>  our $exe_mysqladmin;
>  our $exe_mysqltest;
>  our $exe_libtool;
> @@ -1944,6 +1945,7 @@ sub executable_setup () {
>    # Look for the client binaries
>    $exe_mysqladmin=     mtr_exe_exists("$path_client_bindir/mysqladmin");
>    $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
> +  $exe_mysql_plugin=   mtr_exe_exists("$path_client_bindir/mysql_plugin");
>  
>    if ( ! $opt_skip_ndbcluster )
>    {
> @@ -2219,6 +2221,19 @@ sub environment_setup {
>      push(@ld_library_paths,  "$basedir/storage/ndb/src/.libs");
>    }
>  
> +  # Add the path where daemon_example can be found
> +  # --------------------------------------------------------------------------
> +  if (my $lib_plugin= find_plugin("libdaemon_example", "plugin/daemon_example"))
> +  {
> +    my $lib_dirname= dirname($lib_plugin);
> +    $ENV{'DAEMONEXAMPLE_PLUGIN_DIR'}= $lib_dirname;
> +  }
> +  else
> +  {
> +    $ENV{'DAEMON_EXAMPLE_PLUGIN_DIR'}="";
> +  }
> +
> +  # --------------------------------------------------------------------------

Please don't hardcode plugin variables in mtr itself, instead use the
mechanism in include/plugin.defs which should cover what you need
here.

- Bjorn
Thread
bzr commit into mysql-5.5 branch (chuck.bell:3409) WL#5710chuck.bell26 May
  • Re: bzr commit into mysql-5.5 branch (chuck.bell:3409) WL#5710Bjorn Munch27 May