summaryrefslogtreecommitdiff
path: root/sql/events.cc
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-09-15 14:46:35 +0400
committerSergey Petrunya <psergey@askmonty.org>2009-09-15 14:46:35 +0400
commit151e5d586cc59afb3c664d56d47265c964fe7fb1 (patch)
tree1972ed60ad937e632cf111e7beafb2148a87efeb /sql/events.cc
parent2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff)
parentb495b3db2346a98650946ad5907ba3fe164eadc7 (diff)
downloadmariadb-git-151e5d586cc59afb3c664d56d47265c964fe7fb1.tar.gz
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'sql/events.cc')
-rw-r--r--sql/events.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/events.cc b/sql/events.cc
index 17b00490495..c4c00e09b4a 100644
--- a/sql/events.cc
+++ b/sql/events.cc
@@ -697,8 +697,7 @@ send_show_create_event(THD *thd, Event_timed *et, Protocol *protocol)
field_list.push_back(new Item_empty_string("Event", NAME_CHAR_LEN));
- if (sys_var_thd_sql_mode::symbolic_mode_representation(thd, et->sql_mode,
- &sql_mode))
+ if (sys_var::make_set(thd, et->sql_mode, &sql_mode_typelib, &sql_mode))
DBUG_RETURN(TRUE);
field_list.push_back(new Item_empty_string("sql_mode", (uint) sql_mode.length));