database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-09-02 09:41:40 +03:00
Code Activity

Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rpl

Browse Source 
into  mysql1000.(none):/home/andrei/MySQL/MERGE/5.1-main2rpl


BitKeeper/deleted/.del-binlog_killed_simulate.result:
  Auto merged
BitKeeper/deleted/.del-show_binlog_events.inc:
  Auto merged
mysql-test/suite/rpl/r/rpl_user.result:
  Auto merged
storage/blackhole/ha_blackhole.cc:
  Auto merged
BitKeeper/deleted/.del-show_binary_logs.inc:
  Delete: mysql-test/include/show_binary_logs.inc
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result:
  manual merge ul.
mysql-test/extra/binlog_tests/blackhole.test:
  manual merge
mysql-test/suite/binlog/r/binlog_stm_blackhole.result:
  manual merge
sql/log.cc:
  manual merge
sql/share/errmsg.txt:
  manual merge
sql/sql_class.cc:
  manual merge
This commit is contained in:
unknown
2008-03-29 15:00:12 +02:00
parent cfc420976e 4020e6a2d7
commit 6630d2e18c
10 changed files with 566 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/sql_class.cc
View File

@@ -1069,6 +1069,19 @@ bool THD::store_globals()
void THD::cleanup_after_query()
{
last_insert_id_used= FALSE;
if (clear_next_insert_id)
{
clear_next_insert_id= 0;
next_insert_id= 0;
/*
BUG#33029, if one statement in a SP set this member to 1, all
statment after this statement in the SP would be considered used
INSERT_ID value, reset this member after each query to fix this.
*/
insert_id_used= 0;
}
/*
Reset rand_used so that detection of calls to rand() will save random
seeds if needed by the slave.