summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorunknown <evgen@sunlight.local>2006-04-05 20:12:26 +0400
committerunknown <evgen@sunlight.local>2006-04-05 20:12:26 +0400
commit7042df6228536b05d9eabc7a428af30def8ec204 (patch)
treecaadf65dd865136ee2466310baad951b9add3fef /sql/sql_update.cc
parentb42462c54664816e47db2ebfdabd4bc2f85e62ec (diff)
parentaf5e4098a8ec7677de4e1aae54f9326a5a2ec1c0 (diff)
downloadmariadb-git-7042df6228536b05d9eabc7a428af30def8ec204.tar.gz
Manually merged
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index b19d6504b2e..75e8db6621f 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1229,6 +1229,11 @@ multi_update::initialize_tables(JOIN *join)
Field_string offset(table->file->ref_length, 0, "offset",
&my_charset_bin);
offset.init(table);
+ /*
+ The field will be converted to varstring when creating tmp table if
+ table to be updated was created by mysql 4.1. Deny this.
+ */
+ offset.can_alter_field_type= 0;
if (!(ifield= new Item_field(((Field *) &offset))))
DBUG_RETURN(1);
ifield->maybe_null= 0;