@@ -3583,7 +3583,12 @@ static void MtmGucSet(VariableSetStmt *stmt, const char *queryStr)
35833583hash_search (MtmGucHash ,key ,HASH_REMOVE ,NULL );
35843584}
35853585break ;
3586+
35863587case VAR_RESET_ALL :
3588+ {
3589+ hash_destroy (MtmGucHash );
3590+ MtmGucHashInit ();
3591+ }
35873592break ;
35883593
35893594case VAR_SET_MULTI :
@@ -3595,7 +3600,11 @@ static void MtmGucSet(VariableSetStmt *stmt, const char *queryStr)
35953600
35963601static void MtmGucDiscard (DiscardStmt * stmt )
35973602{
3598-
3603+ if (stmt -> target == DISCARD_ALL )
3604+ {
3605+ hash_destroy (MtmGucHash );
3606+ MtmGucHashInit ();
3607+ }
35993608}
36003609
36013610static void MtmGucClear (void )
@@ -3620,7 +3629,18 @@ static char * MtmGucSerialize(void)
36203629appendStringInfoString (serialized_gucs ,"SET " );
36213630appendStringInfoString (serialized_gucs ,hentry -> key );
36223631appendStringInfoString (serialized_gucs ," TO " );
3623- appendStringInfoString (serialized_gucs ,hentry -> value );
3632+
3633+ /* quite a crutch */
3634+ if (strcmp (hentry -> key ,"work_mem" )== 0 )
3635+ {
3636+ appendStringInfoString (serialized_gucs ,"'" );
3637+ appendStringInfoString (serialized_gucs ,hentry -> value );
3638+ appendStringInfoString (serialized_gucs ,"'" );
3639+ }
3640+ else
3641+ {
3642+ appendStringInfoString (serialized_gucs ,hentry -> value );
3643+ }
36243644appendStringInfoString (serialized_gucs ,"; " );
36253645}
36263646}