database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_25543

Browse Source 
into  mysql_cab_desk.:C:/source/c++/mysql-5.1_BUG_25543


mysql-test/r/rpl_misc_functions.result:
  Auto merged
mysql-test/t/rpl_misc_functions.test:
  Auto merged
sql/sql_class.cc:
  Manual merge of conflicts during push of BUG#25543.
This commit is contained in:
unknown
2007-03-21 10:56:43 -04:00
parent 8a140cb72e 24c0048ed0
commit 89bfca83c9
3 changed files with 102 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_class.cc
View File

@@ -679,11 +679,22 @@ bool THD::store_globals()
void THD::cleanup_after_query()
{
/*
Reset rand_used so that detection of calls to rand() will save random
seeds if needed by the slave.
Do not reset rand_used if inside a stored function or trigger because
only the call to these operations is logged. Thus only the calling
statement needs to detect rand() calls made by its substatements. These
substatements must not set rand_used to 0 because it would remove the
detection of rand() by the calling statement.
*/
if (!in_sub_stmt) /* stored functions and triggers are a special case */
{
/* Forget those values, for next binlogger: */
stmt_depends_on_first_successful_insert_id_in_prev_stmt= 0;
auto_inc_intervals_in_cur_stmt_for_binlog.empty();
rand_used= 0;
}
if (first_successful_insert_id_in_cur_stmt > 0)
{