Reset myvar for each token in parse_set, so that things like

set my_var=val &my_var ?charset work again. Noted by Alain Bench.

diff --git a/init.c b/init.c
index 4259c70150676b0ac917c06d7c9f780550d50c4a..3cce5aaf03cac549800690e099d4858831ca42fb 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1625,7 +1625,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
   int query, unset, inv, reset, r = 0;
   int idx = -1;
   char *p, scratch[_POSIX_PATH_MAX];
-  char* myvar = NULL;
+  char* myvar;
 
   while (MoreArgs (s))
   {
@@ -1634,6 +1634,7 @@ static int parse_set (BUFFER *tmp, BUFFER *s, unsigned long data, BUFFER *err)
     unset = data & M_SET_UNSET;
     inv = data & M_SET_INV;
     reset = data & M_SET_RESET;
+    myvar = NULL;
 
     if (*s->dptr == '?')
     {