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

Manual merge

Browse Source 
mysql-test/r/sp.result:
  Auto merged
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_trigger.h:
  Auto merged
This commit is contained in:
unknown
2005-08-03 03:47:07 +00:00
parent 88105618c5 b323667ffc
commit e442059c0d
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