diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 11:02:07 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-25 11:02:07 +0200 |
| commit | 3467f6376472ce695e36746ba5b3c13cb5fcbb9f (patch) | |
| tree | 31432a470ddb2247e0a3e2bcadd89666e273d904 /sql/table.cc | |
| parent | ce141d0714207afb70911abce21c2a4055b8a9e9 (diff) | |
| parent | eaeb8ec4b87882711ecb8e1c7476a6e410d5d2a9 (diff) | |
| download | mariadb-git-3467f6376472ce695e36746ba5b3c13cb5fcbb9f.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/table.cc')
| -rw-r--r-- | sql/table.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/table.cc b/sql/table.cc index 084b441e4c6..4be8f8c91bb 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1127,7 +1127,7 @@ bool parse_vcol_defs(THD *thd, MEM_ROOT *mem_root, TABLE *table, thd->stmt_arena= table->expr_arena; thd->update_charset(&my_charset_utf8mb4_general_ci, table->s->table_charset); expr_str.append(&parse_vcol_keyword); - thd->variables.sql_mode &= ~MODE_NO_BACKSLASH_ESCAPES; + thd->variables.sql_mode &= ~(MODE_NO_BACKSLASH_ESCAPES | MODE_EMPTY_STRING_IS_NULL); while (pos < end) { @@ -3210,9 +3210,8 @@ ret: if (unlikely(thd->is_error() || error)) { thd->clear_error(); - my_error(ER_SQL_DISCOVER_ERROR, MYF(0), - plugin_name(db_plugin)->str, db.str, table_name.str, - sql_copy); + my_error(ER_SQL_DISCOVER_ERROR, MYF(0), hton_name(hton)->str, + db.str, table_name.str, sql_copy); DBUG_RETURN(HA_ERR_GENERIC); } /* Treat the table as normal table from binary logging point of view */ |