diff options
author | serg@serg.mysql.com <> | 2003-03-20 12:09:20 +0100 |
---|---|---|
committer | serg@serg.mysql.com <> | 2003-03-20 12:09:20 +0100 |
commit | ce016df8832214f9b3f1294413fda716896d253b (patch) | |
tree | 378b8b4e5837a10abcfffc719f0d4cf35e03f677 /sql/sql_update.cc | |
parent | 67fff29100205aa99b5cc807498bb1c9fac97f82 (diff) | |
download | mariadb-git-ce016df8832214f9b3f1294413fda716896d253b.tar.gz |
another bad merge fixed
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 e5c9d160725..ec1183819dc 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -597,7 +597,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, 1, &my_charset_bin); + table, &my_charset_bin); if (temp_fields.push_front(new Item_field(((Field *) &offset)))) DBUG_RETURN(1); |