diff options
| author | gkodinov/kgeorge@magare.gmz <> | 2007-11-13 19:15:49 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@magare.gmz <> | 2007-11-13 19:15:49 +0200 |
| commit | 70f9ec3c8d818a0a7f90f416b30fb66646d26bf4 (patch) | |
| tree | fb15cf5b2be6d09ba10b42a55ff230ea36df0b1c /sql/sql_base.cc | |
| parent | c406150f34793d7fb300ab39e6b23a0a40a6e749 (diff) | |
| parent | eea70871f103cf6b8c7dbb9631185094915cfef8 (diff) | |
| download | mariadb-git-70f9ec3c8d818a0a7f90f416b30fb66646d26bf4.tar.gz | |
Merge magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/B31562-5.1-opt
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index ed76f54c1fb..82a3d4bad75 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -5318,7 +5318,8 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter, if (item_field->field_name && item_field->table_name && !my_strcasecmp(system_charset_info, item_field->field_name, field_name) && - !strcmp(item_field->table_name, table_name) && + !my_strcasecmp(table_alias_charset, item_field->table_name, + table_name) && (!db_name || (item_field->db_name && !strcmp(item_field->db_name, db_name)))) { |