diff options
| author | Sachin <sachin.setiya@mariadb.com> | 2019-01-18 16:39:11 +0530 |
|---|---|---|
| committer | Sachin <sachin.setiya@mariadb.com> | 2019-01-18 16:39:11 +0530 |
| commit | 25e8a3f8789882ba4b0dc2ac8b81a562bae12d46 (patch) | |
| tree | 9fab61a648d459c7ae71b109a25ace9867ae0548 | |
| parent | c1aae370879490dc0a3cd63c5b1010fa21b1f62c (diff) | |
| download | mariadb-git-bb-10.1-17588.tar.gz | |
mdev-17588bb-10.1-17588
| -rw-r--r-- | sql/sql_yacc.yy | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_yacc.yy b/sql/sql_yacc.yy index 0b85b597baf..7a23f5ff4bd 100644 --- a/sql/sql_yacc.yy +++ b/sql/sql_yacc.yy @@ -5790,10 +5790,12 @@ storage_engines: $$= plugin_hton(plugin); else { - if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) + if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION && + !thd->slave_thread) my_yyabort_error((ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str)); $$= 0; - push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, + if (!thd->slave_thread) + push_warning_printf(thd, Sql_condition::WARN_LEVEL_WARN, ER_UNKNOWN_STORAGE_ENGINE, ER_THD(thd, ER_UNKNOWN_STORAGE_ENGINE), $1.str); |