database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge magare.gmz:/home/kgeorge/mysql/autopush/B31562-5.0-opt

Browse Source 
into  magare.gmz:/home/kgeorge/mysql/work/B31562-5.1-opt


sql/item.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/lowercase_view.result:
  merge bug 31562 5.0->5.1: changed explain format
This commit is contained in:
unknown
2007-11-13 19:15:49 +02:00
parent 8021e495cf 4bc635e2f1
commit ad3e5aa856
5 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_base.cc
View File

@ -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))))
{