diff options
author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-28 13:56:08 -0500 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-02-28 13:56:08 -0500 |
commit | c3a2394641e2f7b199977bcf699ad64c1bb1367f (patch) | |
tree | f8867141b6f645065820a14eb74562778ca8d0e4 /mysql-test/suite/galera/galera_2nodes.cnf | |
parent | ae6e1548cbda6cb1509f84edb57786c9520a7a6e (diff) | |
download | mariadb-git-c3a2394641e2f7b199977bcf699ad64c1bb1367f.tar.gz |
* Merged revisions 3945, 3946..3950, 3951..3961
from codership-mysql/5.5.
* Merged changes in innobase to xtradb.
* Updated WSREP_PATCH_REVNO.
Diffstat (limited to 'mysql-test/suite/galera/galera_2nodes.cnf')
-rw-r--r-- | mysql-test/suite/galera/galera_2nodes.cnf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/galera/galera_2nodes.cnf b/mysql-test/suite/galera/galera_2nodes.cnf index b950ae1fe4d..1ef673e9582 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/libgalera_smm.so +wsrep_provider=/usr/lib/galera/libgalera_smm.so wsrep_cluster_address='gcomm://' [mysqld.2] binlog-format=row -wsrep_provider=/usr/lib/libgalera_smm.so +wsrep_provider=/usr/lib/galera/libgalera_smm.so wsrep_cluster_address='gcomm://127.0.0.1:4567' wsrep_provider_options='gmcast.listen_addr=tcp://127.0.0.1:4568' |