database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge chunk from trunk.

Browse Source
This commit is contained in:
Chad MILLER
2008-07-10 14:50:07 -04:00
parent 06756c19c5 dc00a52464
commit c94a46240a
419 changed files with 64719 additions and 54690 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_insert.cc
View File

@@ -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);
}