diff options
| author | unknown <andrey@lmy004.> | 2006-02-20 23:52:22 +0100 |
|---|---|---|
| committer | unknown <andrey@lmy004.> | 2006-02-20 23:52:22 +0100 |
| commit | 203b37effe5dd08e8dfe2499cb672c2fb9702097 (patch) | |
| tree | 6046a6fc84d86f05ea90fc9eee41fe60c7030860 /sql/sql_show.cc | |
| parent | b5236ea789bee0d1a4ffe7fa23194ef04bddcb8d (diff) | |
| download | mariadb-git-203b37effe5dd08e8dfe2499cb672c2fb9702097.tar.gz | |
fix for bug#16407 (Events: Changes in sql_mode won't be taken into account)
WL#1032
sql_mode setting was disregarded during create/alter event and wasn't set during
event execution.
(post-review small fixes)
sql/event.cc:
store the sql_mode when the body is stored
- always on create event
- during alter event if the user changes the body
sql/event.h:
add sql_mode as member variable
sql/event_timed.cc:
- exchange thd->variables.sql_mode before and after execution
- set the sql_mode of the anonymous SP -> event_timed::sphead
sql/sql_show.cc:
- show real content in I_S.EVENTS.SQL_MODE , disallow NULL
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 7a1d843dd45..3ad01ef0ae9 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3877,8 +3877,16 @@ fill_events_copy_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table) sch_table->field[3]->store(et.definer.str, et.definer.length, scs); sch_table->field[4]->store(et.body.str, et.body.length, scs); - // [9] is SQL_MODE and is NULL for now, will be fixed later - sch_table->field[9]->set_null(); + // [9] is SQL_MODE + { + const char *sql_mode_str=""; + ulong sql_mode_len=0; + sql_mode_str= + sys_var_thd_sql_mode::symbolic_mode_representation(thd, et.sql_mode, + &sql_mode_len); + sch_table->field[9]->store((const char*)sql_mode_str, sql_mode_len, scs); + } + if (et.expression) { //type @@ -4720,7 +4728,7 @@ ST_FIELD_INFO events_fields_info[]= {"EXECUTE_AT", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, "Execute at"}, {"INTERVAL_VALUE", 11, MYSQL_TYPE_LONG, 0, 1, "Interval value"}, {"INTERVAL_FIELD", 18, MYSQL_TYPE_STRING, 0, 1, "Interval field"}, - {"SQL_MODE", 65535, MYSQL_TYPE_STRING, 0, 1, 0}, + {"SQL_MODE", 65535, MYSQL_TYPE_STRING, 0, 0, 0}, {"STARTS", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, "Starts"}, {"ENDS", 0, MYSQL_TYPE_TIMESTAMP, 0, 1, "Ends"}, {"STATUS", 8, MYSQL_TYPE_STRING, 0, 0, "Status"}, |