1
0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00

another bad merge fixed

This commit is contained in:
unknown
2003-03-20 12:09:20 +01:00
parent 10096d9185
commit c6778cee9d

View File

@@ -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);