diff options
| author | halfspawn <j.brauge@qualiac.com> | 2017-10-13 15:55:42 +0200 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-10-14 17:28:54 +0400 |
| commit | 75aabd03d57f85d63d57b25a239b4f930a3ae3c0 (patch) | |
| tree | 27b8202dabd463670aa819c36d82b0bfa3da18ca /sql/sp.cc | |
| parent | 081f5aa8262cfa425f3d5e2c242f3888ded98ee2 (diff) | |
| download | mariadb-git-75aabd03d57f85d63d57b25a239b4f930a3ae3c0.tar.gz | |
MDEV-14013 : sql_mode=EMPTY_STRING_IS_NULL
Diffstat (limited to 'sql/sp.cc')
| -rw-r--r-- | sql/sp.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sp.cc b/sql/sp.cc index c8b9e02076b..a275781f74a 100644 --- a/sql/sp.cc +++ b/sql/sp.cc @@ -173,7 +173,8 @@ TABLE_FIELD_TYPE proc_table_fields[MYSQL_PROC_FIELD_COUNT] = "'ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES'," "'STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES'," "'ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER'," - "'HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH')") }, + "'HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH'," + "'EMPTY_STRING_IS_NULL')") }, { NULL, 0 } }, { @@ -688,7 +689,7 @@ Sp_handler::db_find_routine(THD *thd, // Get additional information modified= table->field[MYSQL_PROC_FIELD_MODIFIED]->val_int(); created= table->field[MYSQL_PROC_FIELD_CREATED]->val_int(); - sql_mode= (ulong) table->field[MYSQL_PROC_FIELD_SQL_MODE]->val_int(); + sql_mode= (sql_mode_t) table->field[MYSQL_PROC_FIELD_SQL_MODE]->val_int(); creation_ctx= Stored_routine_creation_ctx::load_from_db(thd, name, table); |