summaryrefslogtreecommitdiff
path: root/sql/sql_view.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2022-04-04 14:50:21 +0400
committerAlexander Barkov <bar@mariadb.com>2023-04-25 12:53:46 +0400
commitcdafad0941f04437eaa0d6d2060e190990f84929 (patch)
treef9c88af9184a80d61a2bd0baaf7d8abc8a82a82d /sql/sql_view.cc
parent01199901d891c52689f1ca9e3fb7a3222b09d18f (diff)
downloadmariadb-git-bb-10.3-bar-MDEV-27744.tar.gz
MDEV-27744 InnoDB: Failing assertion: !cursor->index->is_committed() in row0ins.cc (from row_ins_sec_index_entry_by_modify) | Assertion `0' failed in row_upd_sec_index_entry (debug) | Corruptionbb-10.3-bar-MDEV-27744
The crash happened with an indexed virtual column whose value is evaluated using a function that has a different meaning in sql_mode='' vs sql_mode=ORACLE: - DECODE() - LTRIM() - RTRIM() - LPAD() - RPAD() - REPLACE() - SUBSTR() For example: CREATE TABLE t1 ( b VARCHAR(1), g CHAR(1) GENERATED ALWAYS AS (SUBSTR(b,0,0)) VIRTUAL, KEY g(g) ); So far we had replacement XXX_ORACLE() functions for all mentioned function, e.g. SUBSTR_ORACLE() for SUBSTR(). So it was possible to correctly re-parse SUBSTR_ORACLE() even in sql_mode=''. But it was not possible to re-parse the MariaDB version of SUBSTR() after switching to sql_mode=ORACLE. It was erroneously mis-interpreted as SUBSTR_ORACLE(). As a result, this combination worked fine: SET sql_mode=ORACLE; CREATE TABLE t1 ... g CHAR(1) GENERATED ALWAYS AS (SUBSTR(b,0,0)) VIRTUAL, ...; INSERT ... FLUSH TABLES; SET sql_mode=''; INSERT ... But the other way around it crashed: SET sql_mode=''; CREATE TABLE t1 ... g CHAR(1) GENERATED ALWAYS AS (SUBSTR(b,0,0)) VIRTUAL, ...; INSERT ... FLUSH TABLES; SET sql_mode=ORACLE; INSERT ... At CREATE time, SUBSTR was instantiated as Item_func_substr and printed in the FRM file as substr(). At re-open time with sql_mode=ORACLE, "substr()" was erroneously instantiated as Item_func_substr_oracle. Fix: The fix proposes a symmetric solution. It provides a way to re-parse reliably all sql_mode dependent functions to their original CREATE TABLE time meaning, no matter what the open-time sql_mode is. We take advantage of the same idea we previously used to resolve sql_mode dependent data types. Now all sql_mode dependent functions are printed by SHOW using a schema qualifier when the current sql_mode differs from the function sql_mode: SET sql_mode=''; CREATE TABLE t1 ... SUBSTR(a,b,c) ..; SET sql_mode=ORACLE; SHOW CREATE TABLE t1; -> mariadb_schema.substr(a,b,c) SET sql_mode=ORACLE; CREATE TABLE t2 ... SUBSTR(a,b,c) ..; SET sql_mode=''; SHOW CREATE TABLE t1; -> oracle_schema.substr(a,b,c) Old replacement names like substr_oracle() are still understood for backward compatibility and used in FRM files (for downgrade compatibility), but they are not printed by SHOW any more.
Diffstat (limited to 'sql/sql_view.cc')
-rw-r--r--sql/sql_view.cc43
1 files changed, 6 insertions, 37 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 1b8762f90dd..f3980ad72dd 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -950,16 +950,15 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view,
view_query.length(0);
is_query.length(0);
{
- sql_mode_t sql_mode= thd->variables.sql_mode & MODE_ANSI_QUOTES;
- thd->variables.sql_mode&= ~MODE_ANSI_QUOTES;
+ Sql_mode_save_for_frm_handling sql_mode_save(thd);
- lex->unit.print(&view_query, enum_query_type(QT_VIEW_INTERNAL |
+ lex->unit.print(&view_query, enum_query_type(QT_FOR_FRM |
+ QT_VIEW_INTERNAL |
QT_ITEM_ORIGINAL_FUNC_NULLIF));
- lex->unit.print(&is_query, enum_query_type(QT_TO_SYSTEM_CHARSET |
+ lex->unit.print(&is_query, enum_query_type(QT_ITEM_FUNC_FORCE_SCHEMA_NAME |
+ QT_TO_SYSTEM_CHARSET |
QT_WITHOUT_INTRODUCERS |
QT_ITEM_ORIGINAL_FUNC_NULLIF));
-
- thd->variables.sql_mode|= sql_mode;
}
DBUG_PRINT("info", ("View: %.*s", view_query.length(), view_query.ptr()));
@@ -1420,35 +1419,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
view_select= &lex->select_lex;
view_select->select_number= ++thd->lex->stmt_lex->current_select_number;
- sql_mode_t saved_mode= thd->variables.sql_mode;
- /* switch off modes which can prevent normal parsing of VIEW
- - MODE_REAL_AS_FLOAT affect only CREATE TABLE parsing
- + MODE_PIPES_AS_CONCAT affect expression parsing
- + MODE_ANSI_QUOTES affect expression parsing
- + MODE_IGNORE_SPACE affect expression parsing
- - MODE_IGNORE_BAD_TABLE_OPTIONS affect only CREATE/ALTER TABLE parsing
- * MODE_ONLY_FULL_GROUP_BY affect execution
- * MODE_NO_UNSIGNED_SUBTRACTION affect execution
- - MODE_NO_DIR_IN_CREATE affect table creation only
- - MODE_POSTGRESQL compounded from other modes
- - MODE_ORACLE affects Item creation (e.g for CONCAT)
- - MODE_MSSQL compounded from other modes
- - MODE_DB2 compounded from other modes
- - MODE_MAXDB affect only CREATE TABLE parsing
- - MODE_NO_KEY_OPTIONS affect only SHOW
- - MODE_NO_TABLE_OPTIONS affect only SHOW
- - MODE_NO_FIELD_OPTIONS affect only SHOW
- - MODE_MYSQL323 affect only SHOW
- - MODE_MYSQL40 affect only SHOW
- - MODE_ANSI compounded from other modes
- (+ transaction mode)
- ? MODE_NO_AUTO_VALUE_ON_ZERO affect UPDATEs
- + MODE_NO_BACKSLASH_ESCAPES affect expression parsing
- */
- thd->variables.sql_mode&= ~(MODE_PIPES_AS_CONCAT | MODE_ANSI_QUOTES |
- MODE_IGNORE_SPACE | MODE_NO_BACKSLASH_ESCAPES |
- MODE_ORACLE);
-
+ Sql_mode_save_for_frm_handling sql_mode_save(thd);
/* Parse the query. */
parse_status= parse_sql(thd, & parser_state, table->view_creation_ctx);
@@ -1459,8 +1430,6 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table,
(old_lex->sql_command == SQLCOM_SHOW_CREATE))
lex->sql_command= old_lex->sql_command;
- thd->variables.sql_mode= saved_mode;
-
if (dbchanged && mysql_change_db(thd, &old_db, TRUE))
goto err;
}