database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Manual merge

Browse Source
This commit is contained in:
sergefp@mysql.com
2005-08-03 03:47:07 +00:00
parent 2b70615913 b6a6fe0849
commit f595847ec0
20 changed files with 731 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_trigger.h
View File

@ -82,7 +82,7 @@ public:
if (bodies[event][time_type])
{
bool save_in_sub_stmt= thd->transaction.in_sub_stmt;
bool save_in_sub_stmt= thd->in_sub_stmt;
#ifndef EMBEDDED_LIBRARY
/* Surpress OK packets in case if we will execute statements */
my_bool nsok= thd->net.no_send_ok;
@ -111,11 +111,11 @@ public:
does NOT go into binlog.
*/
tmp_disable_binlog(thd);
thd->transaction.in_sub_stmt= TRUE;
thd->in_sub_stmt= TRUE;
res= bodies[event][time_type]->execute_function(thd, 0, 0, 0);
thd->transaction.in_sub_stmt= save_in_sub_stmt;
thd->in_sub_stmt= save_in_sub_stmt;
reenable_binlog(thd);
#ifndef EMBEDDED_LIBRARY