diff options
| author | unknown <jimw@mysql.com> | 2005-12-12 10:11:56 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-12-12 10:11:56 -0800 |
| commit | d6e5fdf08ab5d78b31587f9847d29c8d46f171e6 (patch) | |
| tree | bbcd25d2b7951525f91290ea07d709f48525c788 /sql/sql_update.cc | |
| parent | 95cabee1dc3a6d44a7e7a4c74c0bd49e00047f5b (diff) | |
| parent | ab597139a7e96d8e3194739299b9dbde5a6cf961 (diff) | |
| download | mariadb-git-d6e5fdf08ab5d78b31587f9847d29c8d46f171e6.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/r/bdb.result:
Resolve conflicts
mysql-test/t/bdb.test:
Resolve conflicts
sql/sql_delete.cc:
Resolve conflicts
sql/sql_insert.cc:
Resolve conflicts
sql/sql_update.cc:
Resolve conflicts
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 6ec895bacb1..a86d1b57190 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -527,6 +527,7 @@ int mysql_update(THD *thd, if (!transactional_table) thd->options|=OPTION_STATUS_NO_TRANS_UPDATE; } + free_underlaid_joins(thd, select_lex); if (transactional_table) { if (ha_autocommit_or_rollback(thd, error >= 0)) @@ -539,7 +540,6 @@ int mysql_update(THD *thd, thd->lock=0; } - free_underlaid_joins(thd, select_lex); if (error < 0) { char buff[STRING_BUFFER_USUAL_SIZE]; |