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/table.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/table.cc')
| -rw-r--r-- | sql/table.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index 8d0a40858da..4c68bcb468a 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2403,7 +2403,7 @@ static bool sql_unusable_for_discovery(THD *thd, handlerton *engine, int TABLE_SHARE::init_from_sql_statement_string(THD *thd, bool write, const char *sql, size_t sql_length) { - ulonglong saved_mode= thd->variables.sql_mode; + sql_mode_t saved_mode= thd->variables.sql_mode; CHARSET_INFO *old_cs= thd->variables.character_set_client; Parser_state parser_state; bool error; @@ -3795,7 +3795,7 @@ bool get_field(MEM_ROOT *mem, Field *field, String *res) String str(buff,sizeof(buff),&my_charset_bin); bool rc; THD *thd= field->get_thd(); - ulonglong sql_mode_backup= thd->variables.sql_mode; + sql_mode_t sql_mode_backup= thd->variables.sql_mode; thd->variables.sql_mode&= ~MODE_PAD_CHAR_TO_FULL_LENGTH; field->val_str(&str); |