diff options
| author | unknown <monty@mysql.com> | 2005-06-28 15:06:16 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-06-28 15:06:16 +0300 |
| commit | 5145698cf6b5ef534f4b3b72715a381b7d7cda87 (patch) | |
| tree | bf56a30c6bb6b1807ab7d923cca1960af81c0459 /sql/sql_insert.cc | |
| parent | 216eba80a72a52f48d2b9eb61f598f705003bc81 (diff) | |
| download | mariadb-git-5145698cf6b5ef534f4b3b72715a381b7d7cda87.tar.gz | |
Move reset of insert_values to ensure it's done also during error conditions
This fixed a failure of insert_update.test on some platforms
mysys/thr_alarm.c:
Fixed problem noticed by valgrind
sql/opt_range.cc:
Simple optimization for common case
sql/sql_base.cc:
Safety assert
sql/sql_insert.cc:
Added comment
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index deccc1d4dca..7d613ad6fbf 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -516,6 +516,10 @@ abort: ON DUPLICATE KEY ... we should be able to refer to sum1 in the ON DUPLICATE KEY part + WARNING + You MUST set table->insert_values to 0 after calling this function + before releasing the table object. + RETURN VALUE 0 OK -1 error (message is not sent to user) |