diff options
author | unknown <igor@olga.mysql.com> | 2007-05-31 23:31:59 -0700 |
---|---|---|
committer | unknown <igor@olga.mysql.com> | 2007-05-31 23:31:59 -0700 |
commit | 77ea801dec71bcc7dcf188ff24ae15a488c6b015 (patch) | |
tree | 705562e416ba5e2acdc1fd1d8ddce87cd7083125 /sql/sql_update.cc | |
parent | 81ffede7fc31c092e618469d961600d70831c863 (diff) | |
download | mariadb-git-77ea801dec71bcc7dcf188ff24ae15a488c6b015.tar.gz |
Post-merge fix.
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 bddf9e2701d..06415b1b54b 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -1656,7 +1656,7 @@ int multi_update::do_updates(bool from_send_error) { if((local_error= tbl->file->rnd_pos(tbl->record[0], - (byte *) tmp_table->field[field_num]->ptr))) + (uchar *) tmp_table->field[field_num]->ptr))) goto err; field_num++; } while((tbl= check_opt_it++)); |