diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-05-25 15:38:57 +0300 |
| commit | 1dea7f79779d13695876b84ebecbf41c13d845cb (patch) | |
| tree | fec8bf2607e69a9c6069001bb0de1f33fcae46ba /sql/sql_view.cc | |
| parent | 04de651725c3eeee8f216c55e2f8133e4547fadb (diff) | |
| parent | 1864a8ea93aa1d1a540c83526a25df2ad0330763 (diff) | |
| download | mariadb-git-1dea7f79779d13695876b84ebecbf41c13d845cb.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 1e3c4ce2a94..c81b5db0d26 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -885,6 +885,13 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, LEX *lex= thd->lex; /* + Ensure character set number != 17 (character set = filename) and mbminlen=1 + because these character sets are not parser friendly, which can give weird + sequence in .frm file of view and later give parsing error. + */ + DBUG_ASSERT(thd->charset()->mbminlen == 1 && thd->charset()->number != 17); + + /* View definition query -- a SELECT statement that fully defines view. It is generated from the Item-tree built from the original (specified by the user) query. The idea is that generated query should eliminates all |