diff options
author | Monty <monty@mariadb.org> | 2016-10-02 16:39:40 +0300 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2016-10-05 01:11:08 +0300 |
commit | 7b96416f3c43f02240864f378513330b85f49521 (patch) | |
tree | e4fa5f570965d5cc36e983275e08f36431a4a654 /sql/sql_view.cc | |
parent | 8be53a389c8eebed337057fa366b7c4506ba16b1 (diff) | |
download | mariadb-git-7b96416f3c43f02240864f378513330b85f49521.tar.gz |
Use sql_mode_t for sql_mode.
This fixed several cases where we where using just ulong for sql_mode
Diffstat (limited to 'sql/sql_view.cc')
-rw-r--r-- | sql/sql_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index c0d9ba48121..55550ddfb8a 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -914,7 +914,7 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, view_query.length(0); is_query.length(0); { - ulong sql_mode= thd->variables.sql_mode & MODE_ANSI_QUOTES; + sql_mode_t sql_mode= thd->variables.sql_mode & MODE_ANSI_QUOTES; thd->variables.sql_mode&= ~MODE_ANSI_QUOTES; lex->unit.print(&view_query, enum_query_type(QT_VIEW_INTERNAL | @@ -1346,7 +1346,7 @@ bool mysql_make_view(THD *thd, TABLE_SHARE *share, TABLE_LIST *table, view_select= &lex->select_lex; view_select->select_number= ++thd->select_number; - ulonglong saved_mode= thd->variables.sql_mode; + 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 |