diff options
author | unknown <bell@sanja.is.com.ua> | 2004-09-16 16:24:46 +0300 |
---|---|---|
committer | unknown <bell@sanja.is.com.ua> | 2004-09-16 16:24:46 +0300 |
commit | 3b4c38336d554ecddec1ad41f60c50fff15a702d (patch) | |
tree | 23a14c8221f0e0a31e95198595c363f3d0ec588b /sql/sql_base.cc | |
parent | 06b8f83f46667d4a1be23804bc982f3f5947397f (diff) | |
parent | 77ee831d3d9230912136d7b91f027f48df84431a (diff) | |
download | mariadb-git-3b4c38336d554ecddec1ad41f60c50fff15a702d.tar.gz |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-sum-4.1
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r-- | sql/sql_base.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 30f97cf20a9..75eb5753e1e 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2142,8 +2142,12 @@ find_item_in_list(Item *find, List<Item> &items, uint *counter, case sensitive. In cases where they are not case sensitive, they are always in lower case. + + item_field->field_name and item_field->table_name can be 0x0 if + item is not fix fielded yet. */ - if (!my_strcasecmp(system_charset_info, item_field->field_name, + 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) && (!db_name || (item_field->db_name && |