diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-29 19:46:11 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-29 19:46:11 +0200 |
| commit | b627e2dbb294b3a9fe64faf017b06988c70ef378 (patch) | |
| tree | 15bec188a00a6867d510a18bdbc57c458934380b /sql/sql_update.cc | |
| parent | b2ffb29ad7c21f03eb606660fa345d54b776b900 (diff) | |
| parent | e528943fca18b18597df6d64f985dc9992442d8d (diff) | |
| download | mariadb-git-b627e2dbb294b3a9fe64faf017b06988c70ef378.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/work-select-4.1
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 8836564c6d4..efc9b183a88 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -585,7 +585,7 @@ multi_update::initialize_tables(JOIN *join) /* ok to be on stack as this is not referenced outside of this func */ Field_string offset(table->file->ref_length, 0, "offset", - table, my_charset_bin); + table, &my_charset_bin); if (temp_fields.push_front(new Item_field(((Field *) &offset)))) DBUG_RETURN(1); |