diff options
| author | Alexander Barkov <bar@mariadb.com> | 2021-12-28 17:43:40 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2021-12-28 19:10:36 +0400 |
| commit | 0cfc092f26b9cc4cdd6e44bd5465953e63754795 (patch) | |
| tree | 56181ea447ec4c1d2aaa233cf8b9b654b4f5e482 /sql/sql_select.cc | |
| parent | 89a0364fc88efa7d91d02839a25fa22e4b276995 (diff) | |
| download | mariadb-git-bb-10.5-bar-MDEV-18918.tar.gz | |
MDEV-18918 SQL mode EMPTY_STRING_IS_NULL breaks RBR upon CREATE TABLE .. SELECTbb-10.5-bar-MDEV-18918
The 10.5 version of the patch.
Removing DEFAULT from INFORMATION_SCHEMA columns.
DEFAULT in read-only tables is rather meaningless.
Upgrade should go smoothly.
Also fixes:
MDEV-20254 Problems with EMPTY_STRING_IS_NULL and I_S tables
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index cb391314603..6fdde5f82dd 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -19377,16 +19377,7 @@ bool Create_tmp_table::add_schema_fields(THD *thd, TABLE *table, DBUG_RETURN(true); // EOM } field->init(table); - switch (def.def()) { - case DEFAULT_NONE: - field->flags|= NO_DEFAULT_VALUE_FLAG; - break; - case DEFAULT_TYPE_IMPLICIT: - break; - default: - DBUG_ASSERT(0); - break; - } + field->flags|= NO_DEFAULT_VALUE_FLAG; add_field(table, field, fieldnr, param->force_not_null_cols); } |