diff options
| author | sergefp@mysql.com <> | 2005-08-03 03:47:07 +0000 |
|---|---|---|
| committer | sergefp@mysql.com <> | 2005-08-03 03:47:07 +0000 |
| commit | f595847ec08e59199302b22ff71e63ce3164a809 (patch) | |
| tree | 551d1a44fe7c14ba73b87378e84fb04d7228ab30 /sql/sql_trigger.h | |
| parent | 2b70615913c3369867932011728d320e4a5a1a0b (diff) | |
| parent | b6a6fe0849a3cba46c4ed6446612bfdb29d162ba (diff) | |
| download | mariadb-git-f595847ec08e59199302b22ff71e63ce3164a809.tar.gz | |
Manual merge
Diffstat (limited to 'sql/sql_trigger.h')
| -rw-r--r-- | sql/sql_trigger.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_trigger.h b/sql/sql_trigger.h index ede2cb39f0e..e2ed4bcc0f4 100644 --- a/sql/sql_trigger.h +++ b/sql/sql_trigger.h @@ -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 |