diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-07-19 13:34:45 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-07-19 13:34:45 +0300 |
| commit | b588c6064638bd9245871cd840695854c1454e8b (patch) | |
| tree | b278e5e15e9edfd555fd2e72df452b45526e7cc5 /sql/sql_insert.cc | |
| parent | 8e3872f34e26149437952832330814abb4438772 (diff) | |
| parent | cccb3aaf70ea1fafc629bcdedd9a2f019629c790 (diff) | |
| download | mariadb-git-b588c6064638bd9245871cd840695854c1454e8b.tar.gz | |
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0
sql/sql_insert.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index ea60716dcf2..195bd559145 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -1319,7 +1319,8 @@ bool select_insert::send_eof() thd->cuted_fields); if (last_insert_id) thd->insert_id(last_insert_id); // For update log - ::send_ok(&thd->net,info.copied,last_insert_id,buff); + if (!unions) + ::send_ok(&thd->net,info.copied,last_insert_id,buff); mysql_update_log.write(thd,thd->query,thd->query_length); if (mysql_bin_log.is_open()) { @@ -1401,7 +1402,9 @@ bool select_create::send_eof() mysql_unlock_tables(thd, lock); if (!table->tmp_table) hash_delete(&open_cache,(byte*) table); - lock=0; table=0; + lock=0; + if (!unions) + table=0; VOID(pthread_mutex_unlock(&LOCK_open)); } return tmp; |