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

Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl

Browse Source 
into  mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
This commit is contained in:
cbell/Chuck@mysql_cab_desk.
2007-02-26 14:30:44 -05:00
parent aafc285d75 9017512bd6
commit e9481608c3
7 changed files with 511 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.cc
View File

@ -2050,6 +2050,10 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
if (!lex->requires_prelocking() || is_update_query(lex->sql_command))
options&= ~OPTION_BIN_LOG;
if ((backup->options & OPTION_BIN_LOG) && is_update_query(lex->sql_command))
mysql_bin_log.start_union_events(this, this->query_id);
/* Disable result sets */
client_capabilities &= ~CLIENT_MULTI_RESULTS;
in_sub_stmt|= new_state;
@ -2096,6 +2100,9 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
sent_row_count= backup->sent_row_count;
client_capabilities= backup->client_capabilities;
if ((options & OPTION_BIN_LOG) && is_update_query(lex->sql_command))
mysql_bin_log.stop_union_events(this);
/*
The following is added to the old values as we are interested in the
total complexity of the query