diff options
| author | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2004-04-07 15:23:05 +0300 |
| commit | 01bcc6ed3c4c1c6515592364b4aec0cae5d2083c (patch) | |
| tree | c7d0df7f0334621904d6713b3ea5f4ba1c9cefbe /sql/sql_base.cc | |
| parent | 5650719565806cfa40bb01dad34fc748a46c5c58 (diff) | |
| parent | 08797f5918915a235a3b92fa0c05ab68388c7800 (diff) | |
| download | mariadb-git-01bcc6ed3c4c1c6515592364b4aec0cae5d2083c.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-ps3-4.1
mysql-test/r/union.result:
Auto merged
sql/item.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 0862de073d3..93050419afa 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1807,7 +1807,7 @@ Field *find_field_in_table(THD *thd,TABLE *table,const char *name,uint length, if (cached_field_index < table->fields && !my_strcasecmp(system_charset_info, table->field[cached_field_index]->field_name, name)) - field_ptr= table->field + cached_field_index; + field_ptr= table->field + cached_field_index; else if (table->name_hash.records) field_ptr= (Field**)hash_search(&table->name_hash,(byte*) name, length); |