1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge 10.2 into 10.3

This commit is contained in:
Marko Mäkelä
2018-05-29 17:34:49 +03:00
76 changed files with 1593 additions and 343 deletions

View File

@ -624,6 +624,7 @@ end:
#endif /* WITH_WSREP */
}
/**
Build stmt_query to write it in the bin-log, the statement to write in
the trigger file and the trigger definer.
@ -1191,6 +1192,12 @@ Table_triggers_list::~Table_triggers_list()
}
}
}
/* Free blobs used in insert */
if (record0_field)
for (Field **fld_ptr= record0_field; *fld_ptr; fld_ptr++)
(*fld_ptr)->free();
if (record1_field)
for (Field **fld_ptr= record1_field; *fld_ptr; fld_ptr++)
delete *fld_ptr;