diff options
| -rw-r--r-- | mysql-test/suite/galera/r/galera_change_user.result | 14 | ||||
| -rw-r--r-- | mysql-test/suite/galera/t/galera_change_user.test | 29 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 16 | ||||
| m--------- | wsrep-lib | 0 |
4 files changed, 59 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/r/galera_change_user.result b/mysql-test/suite/galera/r/galera_change_user.result new file mode 100644 index 00000000000..3be9c956a28 --- /dev/null +++ b/mysql-test/suite/galera/r/galera_change_user.result @@ -0,0 +1,14 @@ +connection node_2; +connection node_1; +connection node_1; +CREATE USER user1; +CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB; +connect node_1a, 127.0.0.1, root, , test, $MYPORT_NODE_1; +disconnect node_1a; +connect node_1a, 127.0.0.1, root, , test, $MYPORT_NODE_1; +START TRANSACTION; +INSERT INTO t1 VALUES (1); +disconnect node_1a; +connection node_1; +DROP TABLE t1; +DROP USER user1; diff --git a/mysql-test/suite/galera/t/galera_change_user.test b/mysql-test/suite/galera/t/galera_change_user.test new file mode 100644 index 00000000000..89efef1dbb0 --- /dev/null +++ b/mysql-test/suite/galera/t/galera_change_user.test @@ -0,0 +1,29 @@ +# +# Check that change user works with Galera +# + +--source include/galera_cluster.inc +--source include/have_innodb.inc + +--connection node_1 +CREATE USER user1; +CREATE TABLE t1 (f1 INT PRIMARY KEY) ENGINE=InnoDB; + +# Change user in idle connection +--connect node_1a, 127.0.0.1, root, , test, $MYPORT_NODE_1 +change_user 'user1'; +reset_connection; +--disconnect node_1a + +# Change user with transaction open +--connect node_1a, 127.0.0.1, root, , test, $MYPORT_NODE_1 +START TRANSACTION; +INSERT INTO t1 VALUES (1); +change_user 'user1'; +reset_connection; +--disconnect node_1a + +--connection node_1 +DROP TABLE t1; +DROP USER user1; + diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 01d0ed1c383..dec67c2c095 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1660,8 +1660,16 @@ bool dispatch_command(enum enum_server_command command, THD *thd, case COM_RESET_CONNECTION: { thd->status_var.com_other++; +#ifdef WITH_WSREP + wsrep_after_command_ignore_result(thd); + wsrep_close(thd); +#endif /* WITH_WSREP */ thd->change_user(); thd->clear_error(); // if errors from rollback +#ifdef WITH_WSREP + wsrep_open(thd); + wsrep_before_command(thd); +#endif /* WITH_WSREP */ /* Restore original charset from client authentication packet.*/ if(thd->org_charset) thd->update_charset(thd->org_charset,thd->org_charset,thd->org_charset); @@ -1673,7 +1681,15 @@ bool dispatch_command(enum enum_server_command command, THD *thd, int auth_rc; status_var_increment(thd->status_var.com_other); +#ifdef WITH_WSREP + wsrep_after_command_ignore_result(thd); + wsrep_close(thd); +#endif /* WITH_WSREP */ thd->change_user(); +#ifdef WITH_WSREP + wsrep_open(thd); + wsrep_before_command(thd); +#endif /* WITH_WSREP */ thd->clear_error(); // if errors from rollback /* acl_authenticate() takes the data from net->read_pos */ diff --git a/wsrep-lib b/wsrep-lib -Subproject e9dafb73734d71ab55078b34748e54f139aec82 +Subproject fd66bdef0bbcdeb3a5189c7f93319cb5f9d77ea |