2012-03-27 13:06:21.670453+00:00 https://api.launchpad.net/1.0/bugs/956585 https://api.launchpad.net/1.0/~wlad-montyprogram https://api.launchpad.net/1.0/maria/+milestone/5.3 https://api.launchpad.net/1.0/bugs/956585/linked_branches https://api.launchpad.net/1.0/bugs/956585/activity https://bugs.launchpad.net/bugs/956585 Vladislav Vaintroub Michael Widenius Maria 5.3 Fix Released Wishlist 2012-03-16 00:06:35.024232+00:00 bug Vladislav Vaintroub added bug attachment added Vladislav Vaintroub maria: assignee Elena Stepanova maria: status Michael Widenius maria: importance Michael Widenius maria: milestone Michael Widenius maria: status Michael Widenius branch linked Launchpad Janitor Vladislav Vaintroub Jean Weisbuch 0, color => 1, - db => 'test', + db => '', delay => 5, filter_user => qr/.?/, filter_db => qr/.?/, @@ -113,6 +114,26 @@ my $RM_RESET = 0; my $RM_NOBLKRD = 3; ## using 4 traps Ctrl-C :-( +## Try ~/.my.cnf first + +my $mycnf = "$ENV{HOME}/.my.cnf"; + +if (-e $mycnf) +{ + my $cfgini = new Config::IniFiles( -file => $mycnf ); + my @sections = ('client', 'mytop'); + + foreach my $section (@sections) { + foreach my $param ($cfgini->Parameters ($section)) + { + $config{$param} = $cfgini->val($section, $param) if exists $config{$param}; + } + } + ## map database/password onto db/pass (long version gets precedence in .my.cnf) + $config{'db'} = $config{'database'} if $config{'database'}; + $config{'pass'} = $config{'password'} if $config{'password'}; +} + ## Read the user's config file, if it exists. my $config = "$ENV{HOME}/.mytop"; ]]> Jean Weisbuch Michael Widenius lp:maria/5.3 LPexportBug956585_mytop-fullqueries.diff