database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '5.5' into 10.1

Browse Source
This commit is contained in:
Oleksandr Byelkin
2019-07-25 13:27:11 +02:00
parent 8d0dabc56b 2536c0b1eb
commit ae476868a5
63 changed files with 3192 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_insert.cc
View File

@ -3871,8 +3871,12 @@ void select_insert::abort_result_set() {
example), no table will have been opened and therefore 'table'
will be NULL. In that case, we still need to execute the rollback
and the end of the function.
If it fail due to inability to insert in multi-table view for example,
table will be assigned with view table structure, but that table will
not be opened really (it is dummy to check fields types & Co).
*/
if (table)
if (table && table->file->get_table())
{
bool changed, transactional_table;
/*