diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /sql/parse_file.cc | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'sql/parse_file.cc')
| -rw-r--r-- | sql/parse_file.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/parse_file.cc b/sql/parse_file.cc index 90d766f15d2..751ca180f97 100644 --- a/sql/parse_file.cc +++ b/sql/parse_file.cc @@ -483,8 +483,7 @@ frm_error: my_error(ER_FPARSER_BAD_HEADER, MYF(0), file_name->str); DBUG_RETURN(0); } - else - DBUG_RETURN(parser); // upper level have to check parser->ok() + DBUG_RETURN(parser); // upper level have to check parser->ok() } |