bk commit into 5.1 tree (SergeyV:1.1999)

[sergeyv]

Below is the list of changes that have just been committed into a local
5.1 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1999 05/12/01 23:47:44 SergeyV@selena. +4 -0
  Merge selena.:H:/MYSQL/bkt/mysql-5.0
  into  selena.:H:/MYSQL/bkt/mysql-5.1

  storage/myisam/mi_check.c
    1.141 05/12/01 23:47:32 SergeyV@selena. +0 -0
    Auto merged

  sql/sql_class.h
    1.273 05/12/01 23:47:31 SergeyV@selena. +0 -0
    Auto merged

  sql/sql_class.cc
    1.225 05/12/01 23:47:31 SergeyV@selena. +0 -0
    Auto merged

  sql/sp_head.cc
    1.200 05/12/01 23:47:31 SergeyV@selena. +0 -0
    Auto merged

  storage/myisam/mi_check.c
    1.129.11.2 05/12/01 23:47:30 SergeyV@selena. +0 -0
    Merge rename: myisam/mi_check.c -> storage/myisam/mi_check.c


# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/bkt/mysql-5.1/RESYNC

--- 1.224/sql/sql_class.cc	2005-12-01 13:12:20 +03:00
+++ 1.225/sql/sql_class.cc	2005-12-01 23:47:31 +03:00
@@ -1951,6 +1951,7 @@
   backup->last_insert_id=  last_insert_id;
   backup->next_insert_id=  next_insert_id;
   backup->insert_id_used=  insert_id_used;
+  backup->clear_next_insert_id= clear_next_insert_id;
   backup->limit_found_rows= limit_found_rows;
   backup->examined_row_count= examined_row_count;
   backup->sent_row_count=   sent_row_count;
@@ -2002,6 +2003,7 @@
   last_insert_id=   backup->last_insert_id;
   next_insert_id=   backup->next_insert_id;
   insert_id_used=   backup->insert_id_used;
+  clear_next_insert_id= backup->clear_next_insert_id;
   limit_found_rows= backup->limit_found_rows;
   sent_row_count=   backup->sent_row_count;
   client_capabilities= backup->client_capabilities;

--- 1.272/sql/sql_class.h	2005-12-01 13:12:20 +03:00
+++ 1.273/sql/sql_class.h	2005-12-01 23:47:31 +03:00
@@ -1101,7 +1101,7 @@
   ha_rows    cuted_fields, sent_row_count, examined_row_count;
   ulong client_capabilities;
   uint in_sub_stmt;
-  bool enable_slow_log, insert_id_used;
+  bool enable_slow_log, insert_id_used, clear_next_insert_id;
   my_bool no_send_ok;
   SAVEPOINT *savepoints;
 };

--- 1.199/sql/sp_head.cc	2005-11-28 22:07:12 +03:00
+++ 1.200/sql/sp_head.cc	2005-12-01 23:47:31 +03:00
@@ -1075,7 +1075,7 @@
     }
 
     /* we should cleanup free_list and memroot, used by instruction */
-    thd->free_items();
+    thd->cleanup_after_query();
     free_root(&execute_mem_root, MYF(0));    
 
     /*