diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-16 14:56:59 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2021-02-16 14:56:59 +0100 |
| commit | e0072fadcb00edae74e748aee3148075b9cddae2 (patch) | |
| tree | 625d5c0869cfbb322a2b4cdaab453e17fd5d31bf /sql/create_options.cc | |
| parent | 1146e98b3af3e2b15df0598a860f4571663a98d0 (diff) | |
| parent | ae7989ca2059869f81c837509e5ff554f7f63562 (diff) | |
| download | mariadb-git-10.6-halfmerge.tar.gz | |
Merge branch 'bb-10.5-release' into bb-10.6-release10.6-halfmerge
Diffstat (limited to 'sql/create_options.cc')
| -rw-r--r-- | sql/create_options.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc index 04469120db1..60e9b733efc 100644 --- a/sql/create_options.cc +++ b/sql/create_options.cc @@ -97,14 +97,13 @@ static bool report_unknown_option(THD *thd, engine_option_value *val, { DBUG_ENTER("report_unknown_option"); - if (val->parsed || suppress_warning) + if (val->parsed || suppress_warning || thd->slave_thread) { DBUG_PRINT("info", ("parsed => exiting")); DBUG_RETURN(FALSE); } - if (!(thd->variables.sql_mode & MODE_IGNORE_BAD_TABLE_OPTIONS) && - !thd->slave_thread) + if (!(thd->variables.sql_mode & MODE_IGNORE_BAD_TABLE_OPTIONS)) { my_error(ER_UNKNOWN_OPTION, MYF(0), val->name.str); DBUG_RETURN(TRUE); |