diff options
| author | Sergey Petrunia <sergefp@mysql.com> | 2008-07-15 21:46:02 +0400 |
|---|---|---|
| committer | Sergey Petrunia <sergefp@mysql.com> | 2008-07-15 21:46:02 +0400 |
| commit | 7a92412c5959ce3c216485be1951dead7d778326 (patch) | |
| tree | 466955c9bb93adf167f39ad0a759ea8e1ac8144d /sql/sql_update.cc | |
| parent | a3619d2e865eb5705a8acfc10db91ae700bb7043 (diff) | |
| parent | 62513bb1bca33902fa909ca13b25c550046ee3ae (diff) | |
| download | mariadb-git-7a92412c5959ce3c216485be1951dead7d778326.tar.gz | |
Merge fix for BUG#35478 into 5.1
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index bfb71db22da..637bc00fe8a 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -457,7 +457,7 @@ int mysql_update(THD *thd, */ if (used_index == MAX_KEY || (select && select->quick)) - init_read_record(&info,thd,table,select,0,1); + init_read_record(&info, thd, table, select, 0, 1, FALSE); else init_read_record_idx(&info, thd, table, 1, used_index); @@ -523,7 +523,7 @@ int mysql_update(THD *thd, if (select && select->quick && select->quick->reset()) goto err; table->file->try_semi_consistent_read(1); - init_read_record(&info,thd,table,select,0,1); + init_read_record(&info, thd, table, select, 0, 1, FALSE); updated= found= 0; /* Generate an error when trying to set a NOT NULL field to NULL. */ |