diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 11:32:21 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-01 12:03:55 +0300 |
| commit | ea2bc974dce2ac509011807c80b36192cd18f686 (patch) | |
| tree | afbed3c29a2af90c44af2f086c6eb0d83c909840 /dbug/dbug.c | |
| parent | fbfb5b5f68a428ec819bc09d14b30cebf660b37b (diff) | |
| parent | 1ea266f3ef36e779d23697b18cb94e1b0f8e65ef (diff) | |
| download | mariadb-git-ea2bc974dce2ac509011807c80b36192cd18f686.tar.gz | |
Merge 10.1 into 10.2bb-10.2-merge
Diffstat (limited to 'dbug/dbug.c')
| -rw-r--r-- | dbug/dbug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbug/dbug.c b/dbug/dbug.c index e7bf69a14e5..831ea7fb431 100644 --- a/dbug/dbug.c +++ b/dbug/dbug.c @@ -486,6 +486,7 @@ static int DbugParse(CODE_STATE *cs, const char *control) rel= control[0] == '+' || control[0] == '-'; if ((!rel || (!stack->out_file && !stack->next))) { + LockIfInitSettings(cs); FreeState(cs, 0); stack->flags= 0; stack->delay= 0; @@ -493,10 +494,9 @@ static int DbugParse(CODE_STATE *cs, const char *control) stack->sub_level= 0; stack->out_file= sstderr; stack->functions= NULL; - LockIfInitSettings(cs); stack->keywords= NULL; - UnlockIfInitSettings(cs); stack->processes= NULL; + UnlockIfInitSettings(cs); } else if (!stack->out_file) { |