diff options
| author | He Zhenxing <zhenxing.he@sun.com> | 2009-12-04 10:05:43 +0800 |
|---|---|---|
| committer | He Zhenxing <zhenxing.he@sun.com> | 2009-12-04 10:05:43 +0800 |
| commit | 560db2bda3188efab448f18b0b377f1af7c8d229 (patch) | |
| tree | cd8999d7c4f8bb4ba38b3dae0624b78b67c3b60e /mysql-test | |
| parent | 908b31edf788860ff02413fa6094225cf7983972 (diff) | |
| parent | 21c5cbe1b3f5c36768c5c3ed0a57129213bb7ae2 (diff) | |
| download | mariadb-git-560db2bda3188efab448f18b0b377f1af7c8d229.tar.gz | |
Auto Merge fix for Bug#49170
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index ddee67c124e..e88548595ef 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1834,11 +1834,13 @@ sub environment_setup { my $lib_semisync_master_plugin= mtr_file_exists(vs_config_dirs('plugin/semisync',$semisync_master_filename), "$basedir/plugin/semisync/.libs/" . $semisync_master_filename, - "$basedir/lib/mysql/plugin/" . $semisync_master_filename); + "$basedir/lib/mysql/plugin/" . $semisync_master_filename, + "$basedir/lib/plugin/" . $semisync_master_filename); my $lib_semisync_slave_plugin= mtr_file_exists(vs_config_dirs('plugin/semisync',$semisync_slave_filename), "$basedir/plugin/semisync/.libs/" . $semisync_slave_filename, - "$basedir/lib/mysql/plugin/" . $semisync_slave_filename); + "$basedir/lib/mysql/plugin/" . $semisync_slave_filename, + "$basedir/lib/plugin/" . $semisync_slave_filename); if ($lib_semisync_master_plugin && $lib_semisync_slave_plugin) { $ENV{'SEMISYNC_MASTER_PLUGIN'}= basename($lib_semisync_master_plugin); |