diff options
| author | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
|---|---|---|
| committer | Chad MILLER <chad@mysql.com> | 2008-07-10 14:50:07 -0400 |
| commit | c425bf421da9ffa55d3d568f70508fa12dd07aa0 (patch) | |
| tree | 667c2782c7fcee247010d3413aaf80a81fc6dd92 /sql/sql_insert.cc | |
| parent | 6a6e77eeffc7dbd72888ef685fdb93fc2ae7aed6 (diff) | |
| parent | 0db1f520c629455b4766c3d8f57a9767d7f6a98f (diff) | |
| download | mariadb-git-c425bf421da9ffa55d3d568f70508fa12dd07aa0.tar.gz | |
Merge chunk from trunk.
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 67906b086d6..f2a539fd02b 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3006,7 +3006,8 @@ bool select_insert::send_eof() ((thd->client_capabilities & CLIENT_FOUND_ROWS) ? info.touched : info.updated); id= autoinc_value_of_first_inserted_row > 0 ? - autoinc_value_of_first_inserted_row : thd->last_insert_id; + autoinc_value_of_first_inserted_row : thd->insert_id_used ? + thd->last_insert_id : 0; ::send_ok(thd, (ulong) thd->row_count_func, id, buff); DBUG_RETURN(0); } |