diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-05-20 14:57:29 +0200 |
| commit | 7f6f53a8df10c76f93848c8d06bc5af71051c525 (patch) | |
| tree | 9a539823cdf05f53574fdf91941b3a242025acba /sql/sql_show.cc | |
| parent | 0e7e724d6b36b2f5b8a0604171adb750d7c82c9c (diff) | |
| parent | 280fcf08085e43b5359ec79c0e34166e51b3ebd8 (diff) | |
| download | mariadb-git-7f6f53a8df10c76f93848c8d06bc5af71051c525.tar.gz | |
5.2 merge
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 0fc9de286b2..5a1739369d7 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -4811,7 +4811,8 @@ bool store_schema_proc(THD *thd, TABLE *table, TABLE *proc_table, (sql_command_flags[lex->sql_command] & CF_STATUS_COMMAND) == 0) { restore_record(table, s->default_values); - if (!wild || !wild[0] || !wild_compare(sp_name.c_ptr_safe(), wild, 0)) + if (!wild || !wild[0] || !wild_case_compare(system_charset_info, + sp_name.c_ptr_safe(), wild)) { int enum_idx= (int) proc_table->field[5]->val_int(); table->field[3]->store(sp_name.ptr(), sp_name.length(), cs); @@ -5804,7 +5805,7 @@ copy_event_to_schema_table(THD *thd, TABLE *sch_table, TABLE *event_table) DBUG_RETURN(1); } - if (!(!wild || !wild[0] || !wild_compare(et.name.str, wild, 0))) + if (!(!wild || !wild[0] || !wild_case_compare(scs, et.name.str, wild))) DBUG_RETURN(0); /* |