allocate session_authorization role in TopMemoryContext

kelvich · kelvich · commit c45303d48838 · 2017-11-13T02:17:36.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -4493,6 +4493,7 @@ static void MtmGucInit(void)
 {
 	HASHCTL		hash_ctl;
 	char	   *current_role;
+	MemoryContext oldcontext;
 
 	MemSet(&hash_ctl, 0, sizeof(hash_ctl));
 	hash_ctl.keysize = GUC_KEY_MAXLEN;
@@ -4507,9 +4508,11 @@ static void MtmGucInit(void)
 	 * If current role is not equal to MtmDatabaseUser, than set it bofore
 	 * any other GUC vars.
 	 */
+	oldcontext = MemoryContextSwitchTo(TopMemoryContext);
 	current_role = GetConfigOptionByName("session_authorization", NULL, false);
 	if (strcmp(MtmDatabaseUser, current_role) != 0)
 		MtmGucUpdate("session_authorization", current_role);
+	MemoryContextSwitchTo(oldcontext);
 }
 
 static void MtmGucDiscard()
diff --git a/sql/multimaster.sql b/sql/multimaster.sql
@@ -4,6 +4,7 @@ alter schema user1 owner to user1;
 
 \c "user=user1 dbname=regression"
 create table user1.test(i int primary key);
+create table user1.test2(i int primary key);
 
 \c "user=user1 dbname=regression port=5433"
 select * from test;
