diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-01 19:19:48 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-01 19:19:48 -0400 |
| commit | 3061aa4ead8345cac36c2decb54fe617d6837f2b (patch) | |
| tree | e02b7e6f3c0315973a3608964300b30c9fa17673 /mysql-test/suite | |
| parent | 4515a6d31e954194482cda99204792dcf9ab75a3 (diff) | |
| download | mariadb-git-3061aa4ead8345cac36c2decb54fe617d6837f2b.tar.gz | |
MDEV-6196 MTR: Do not hardcode path for libgalera_smm.so
Introduced an environment variable WSREP_PROVIDER to point
to the galera library.
Updated the tests.
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/galera/galera_2nodes.cnf | 4 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/binlog_format.opt | 2 | ||||
| -rw-r--r-- | mysql-test/suite/wsrep/t/pool_of_threads.opt | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf index 1ef673e9582..21a45dec5f3 100644 --- a/mysql-test/suite/galera/galera_2nodes.cnf +++ b/mysql-test/suite/galera/galera_2nodes.cnf @@ -3,12 +3,12 @@ [mysqld.1] binlog-format=row -wsrep_provider=/usr/lib/galera/libgalera_smm.so +wsrep_provider=@ENV.WSREP_PROVIDER wsrep_cluster_address='gcomm://' [mysqld.2] binlog-format=row -wsrep_provider=/usr/lib/galera/libgalera_smm.so +wsrep_provider=@ENV.WSREP_PROVIDER wsrep_cluster_address='gcomm://127.0.0.1:4567' wsrep_provider_options='gmcast.listen_addr=tcp://127.0.0.1:4568' diff --git a/mysql-test/suite/wsrep/t/binlog_format.opt b/mysql-test/suite/wsrep/t/binlog_format.opt index 771d9b05e1e..83194184e17 100644 --- a/mysql-test/suite/wsrep/t/binlog_format.opt +++ b/mysql-test/suite/wsrep/t/binlog_format.opt @@ -1 +1 @@ ---binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=/usr/lib/galera/libgalera_smm.so --wsrep-cluster-address=gcomm:// --wsrep-on=1 --log-bin +--binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --wsrep-on=1 --log-bin diff --git a/mysql-test/suite/wsrep/t/pool_of_threads.opt b/mysql-test/suite/wsrep/t/pool_of_threads.opt index 92994ddfb68..fb23fb50a67 100644 --- a/mysql-test/suite/wsrep/t/pool_of_threads.opt +++ b/mysql-test/suite/wsrep/t/pool_of_threads.opt @@ -1 +1 @@ ---binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=/usr/lib/galera/libgalera_smm.so --wsrep-cluster-address=gcomm:// --thread_handling=pool-of-threads +--binlog-format=row --innodb_autoinc_lock_mode=2 --innodb_locks_unsafe_for_binlog=1 --wsrep-provider=$WSREP_PROVIDER --wsrep-cluster-address=gcomm:// --thread_handling=pool-of-threads |