From ce016df8832214f9b3f1294413fda716896d253b Mon Sep 17 00:00:00 2001
From: "serg@serg.mysql.com" <>
Date: Thu, 20 Mar 2003 12:09:20 +0100
Subject: another bad merge fixed

---
 sql/sql_update.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'sql/sql_update.cc')

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);
 
-- 
cgit v1.2.1