another bad merge fixed

ce016df8 · serg@serg.mysql.com · 67fff291 · ce016df8
Commit ce016df8 authored Mar 20, 2003 by serg@serg.mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_update.cc sql/sql_update.cc +1 -1

No files found.
--- 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);