[Commits] Rev 2841: merge in http://bazaar.launchpad.net/~maria-captains/maria/5.2/

serg at askmonty.org serg at askmonty.org
Sun Aug 29 23:30:56 EEST 2010


At http://bazaar.launchpad.net/~maria-captains/maria/5.2/

------------------------------------------------------------
revno: 2841 [merge]
revision-id: sergii at pisem.net-20100829203023-34bvhab9rjpnsljf
parent: sergii at pisem.net-20100829121844-6kiywpu29fcz29av
parent: sergii at pisem.net-20100829170226-d2192of1su7hsee4
committer: Sergei Golubchik <sergii at pisem.net>
branch nick: 5.2
timestamp: Sun 2010-08-29 22:30:23 +0200
message:
  merge
modified:
  mysql-test/lib/My/ConfigFactory.pm sp1f-configfactory.pm-20071212171904-umibosyolpj2kzgk32rt5p6pl6vztmaq
-------------- next part --------------
=== modified file 'mysql-test/lib/My/ConfigFactory.pm'
--- a/mysql-test/lib/My/ConfigFactory.pm	2010-08-17 07:14:46 +0000
+++ b/mysql-test/lib/My/ConfigFactory.pm	2010-08-29 17:02:26 +0000
@@ -606,7 +606,7 @@ sub new_config {
 
   # add auto-options
   $config->insert('OPT', 'port'   => sub { fix_port($self, $config) });
-  $config->insert('OPT', 'vardir' => sub { shift->{ARGS}->{vardir} });
+  $config->insert('OPT', 'vardir' => sub { $self->{ARGS}->{vardir} });
 
   {
     # Run pre rules



More information about the commits mailing list