Merge branch 'mysql-5.6' into mysql-5.7

percona · Dec 4, 2016 · f6dfd18 · f6dfd18
2 parents 15829c1 + de8af14
commit f6dfd18
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/regex/regcomp.c b/regex/regcomp.c
@@ -1491,6 +1491,7 @@ sopno size;
 
         DBUG_EXECUTE_IF("bug24449090_simulate_oom",
                         {
+                          free(p->strip);
                           p->strip= NULL;
                           p->ssize= 0;
                           SETERROR(MY_REG_ESPACE);