diff options
| author | unknown <dlenev@mysql.com> | 2005-06-07 14:54:48 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-06-07 14:54:48 +0400 |
| commit | 06a948c36bedd42eb9a702bd657718332b813b12 (patch) | |
| tree | 4c110661c064796fe0e603b60b434617ba7fe84e /sql/item_func.cc | |
| parent | 1531ab871092791a384da81e76e8e9199aaf1097 (diff) | |
| parent | 49357ae8f0643bc7828a57c5f078d8aab4d35e0c (diff) | |
| download | mariadb-git-06a948c36bedd42eb9a702bd657718332b813b12.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg10015
sql/handler.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 78b8e4b6671..68292859504 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -4786,6 +4786,7 @@ Item_func_sp::execute(Item **itp) THD *thd= current_thd; ulong old_client_capabilites; int res; + bool save_in_sub_stmt= thd->transaction.in_sub_stmt; #ifndef NO_EMBEDDED_ACCESS_CHECKS st_sp_security_context save_ctx; #endif @@ -4828,9 +4829,11 @@ Item_func_sp::execute(Item **itp) problem). */ tmp_disable_binlog(thd); /* don't binlog the substatements */ + thd->transaction.in_sub_stmt= TRUE; res= m_sp->execute_function(thd, args, arg_count, itp); + thd->transaction.in_sub_stmt= save_in_sub_stmt; reenable_binlog(thd); if (res && mysql_bin_log.is_open() && (m_sp->m_chistics->daccess == SP_CONTAINS_SQL || |