Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-real-bug21726


sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

1 files changed, 15 insertions, 1 deletions

diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index 093173ab949..4d47ec338c0 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -553,10 +553,24 @@ bool THD::store_globals()
 }
 
 
-/* Cleanup after a query */
+/*
+  Cleanup after query.
+
+  SYNOPSIS
+    THD::cleanup_after_query()
 
+  DESCRIPTION
+    This function is used to reset thread data to it's default state.
+
+  NOTE
+    This function is not suitable for setting thread data to some
+    non-default values, as there is only one replication thread, so
+    different master threads may overwrite data of each other on
+    slave.
+*/
 void THD::cleanup_after_query()
 {
+  last_insert_id_used= FALSE;
   if (clear_next_insert_id)
   {
     clear_next_insert_id= 0;