diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-08-19 00:10:21 +0300 |
| commit | 755e72a0f55b593cf930ae9bd69998f82b70d5cf (patch) | |
| tree | bf340fae8765f9d5f1e1ac543d2926bef0021e03 /sql/sql_update.cc | |
| parent | 2901c3b8fa7d4095445c6ca2070367d2f61af2d1 (diff) | |
| parent | a7c82c5693110bfa744bd4cf481b02eaabb7a0aa (diff) | |
| download | mariadb-git-755e72a0f55b593cf930ae9bd69998f82b70d5cf.tar.gz | |
merge
configure.in:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/item.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 199693df7d6..3fc9f77a8da 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -641,7 +641,8 @@ multi_update::initialize_tables(JOIN *join) temp_fields, (ORDER*) &group, 0, 0, TMP_TABLE_ALL_COLUMNS, - HA_POS_ERROR))) + HA_POS_ERROR, + (char *) ""))) DBUG_RETURN(1); tmp_tables[cnt]->file->extra(HA_EXTRA_WRITE_CACHE); } |