diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-30 19:42:03 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-30 19:42:03 +0200 |
| commit | f32d1148ac26cea47e5a18b5ed71e2f3dfd34127 (patch) | |
| tree | e65a242470eeb2ba49f452576a2d1c9e73049583 /sql/item.cc | |
| parent | 13587ca070a75fa10882f03ae4a46a89b2374355 (diff) | |
| parent | 23af1755f4e060b1121cae6a86df7510b3bba1b5 (diff) | |
| download | mariadb-git-f32d1148ac26cea47e5a18b5ed71e2f3dfd34127.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.1
into sinisa.nasamreza.org:/mnt/work/mysql-4.1
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_show.cc:
Auto merged
Diffstat (limited to 'sql/item.cc')
| -rw-r--r-- | sql/item.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc index a43bf781ee1..95689e20faa 100644 --- a/sql/item.cc +++ b/sql/item.cc @@ -607,7 +607,6 @@ bool Item_field::fix_fields(THD *thd, TABLE_LIST *tables, Item **ref) (char *)field_name); if (!r) return 1; - int res; if (r->check_cols(1) || r->fix_fields(thd, tables, ref)) return 1; r->depended_from= last; |