database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Merge mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

Browse Source 
into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


sql/sql_load.cc:
  Auto merged
mysql-test/r/rpl_user_variables.result:
  Manual merge
mysql-test/t/rpl_user_variables.test:
  Manual merge
sql/item_func.cc:
  Manual merge
sql/log.cc:
  Manual merge
sql/sp_head.cc:
  Manual merge
sql/sql_class.cc:
  Manual merge
sql/sql_class.h:
  Manual merge
This commit is contained in:
unknown
2007-02-27 19:20:47 +01:00
parent d81607a8f9 0ddc3250e9
commit 7443227bca
5 changed files with 418 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@@ -2157,7 +2157,7 @@ void THD::reset_sub_statement_state(Sub_statement_state *backup,
!current_stmt_binlog_row_based)
{
options&= ~OPTION_BIN_LOG;
}
}
if ((backup->options & OPTION_BIN_LOG) && is_update_query(lex->sql_command)&&
!current_stmt_binlog_row_based)
@@ -2209,7 +2209,7 @@ void THD::restore_sub_statement_state(Sub_statement_state *backup)
if ((options & OPTION_BIN_LOG) && is_update_query(lex->sql_command) &&
!current_stmt_binlog_row_based)
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