diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2009-09-15 14:46:35 +0400 |
| commit | 151e5d586cc59afb3c664d56d47265c964fe7fb1 (patch) | |
| tree | 1972ed60ad937e632cf111e7beafb2148a87efeb /sql/sql_show.cc | |
| parent | 2083b7ddfd85b2bab837b73cb8357afcc2e893d8 (diff) | |
| parent | b495b3db2346a98650946ad5907ba3fe164eadc7 (diff) | |
| download | mariadb-git-151e5d586cc59afb3c664d56d47265c964fe7fb1.tar.gz | |
Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index c8936be1ea4..18e83498f7d 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4570,8 +4570,7 @@ static bool store_trigger(THD *thd, TABLE *table, LEX_STRING *db_name, table->field[14]->store(STRING_WITH_LEN("OLD"), cs); table->field[15]->store(STRING_WITH_LEN("NEW"), cs); - sys_var_thd_sql_mode::symbolic_mode_representation(thd, sql_mode, - &sql_mode_rep); + sys_var::make_set(thd, sql_mode, &sql_mode_typelib, &sql_mode_rep); table->field[17]->store(sql_mode_rep.str, sql_mode_rep.length, cs); table->field[18]->store(definer_buffer->str, definer_buffer->length, cs); table->field[19]->store(client_cs_name->str, client_cs_name->length, cs); @@ -5164,8 +5163,7 @@ copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table) /* SQL_MODE */ { LEX_STRING sql_mode; - sys_var_thd_sql_mode::symbolic_mode_representation(thd, et.sql_mode, - &sql_mode); + sys_var::make_set(thd, et.sql_mode, &sql_mode_typelib, &sql_mode); sch_table->field[ISE_SQL_MODE]-> store(sql_mode.str, sql_mode.length, scs); } @@ -6870,9 +6868,7 @@ static bool show_create_trigger_impl(THD *thd, &trg_connection_cl_name, &trg_db_cl_name); - sys_var_thd_sql_mode::symbolic_mode_representation(thd, - trg_sql_mode, - &trg_sql_mode_str); + sys_var::make_set(thd, trg_sql_mode, &sql_mode_typelib, &trg_sql_mode_str); /* Resolve trigger client character set. */ |