bk commit into 5.0 tree (kent:1.1972)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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.1972 05/12/03 14:40:24 kent@stripped +4 -0
  Merge kboortz@stripped:/home/bk/mysql-5.0
  into mysql.com:/Users/kent/mysql/bk/mysql-5.0

  sql/sql_class.h
    1.277 05/12/03 14:40:20 kent@stripped +0 -0
    Auto merged

  sql/sp_head.cc
    1.197 05/12/03 14:40:20 kent@stripped +0 -0
    Auto merged

  mysql-test/t/sp.test
    1.165 05/12/03 14:40:19 kent@stripped +0 -0
    Auto merged

  mysql-test/r/sp.result
    1.172 05/12/03 14:40:19 kent@stripped +0 -0
    Auto merged

# 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:	kent
# Host:	c-664072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.0/RESYNC

--- 1.276/sql/sql_class.h	2005-11-28 10:26:42 +01:00
+++ 1.277/sql/sql_class.h	2005-12-03 14:40:20 +01:00
@@ -1090,7 +1090,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;
 };
@@ -1822,11 +1822,18 @@
   uint  convert_blob_length; 
   CHARSET_INFO *table_charset; 
   bool schema_table;
+  /*
+    True if GROUP BY and its aggregate functions are already computed
+    by a table access method (e.g. by loose index scan). In this case
+    query execution should not perform aggregation and should treat
+    aggregate functions as normal functions.
+  */
+  bool precomputed_group_by;
 
   TMP_TABLE_PARAM()
     :copy_field(0), group_parts(0),
      group_length(0), group_null_parts(0), convert_blob_length(0),
-     schema_table(0)
+     schema_table(0), precomputed_group_by(0)
   {}
   ~TMP_TABLE_PARAM()
   {

--- 1.196/sql/sp_head.cc	2005-12-01 04:06:54 +01:00
+++ 1.197/sql/sp_head.cc	2005-12-03 14:40:20 +01:00
@@ -954,8 +954,12 @@
   m_first_instance->m_first_free_instance= m_next_cached_sp;
   DBUG_PRINT("info", ("first free for 0x%lx ++: 0x%lx->0x%lx, level: %lu, flags %x",
                       (ulong)m_first_instance, this, m_next_cached_sp,
-                      m_next_cached_sp->m_recursion_level,
-                      m_next_cached_sp->m_flags));
+                      (m_next_cached_sp ?
+                       m_next_cached_sp->m_recursion_level :
+                       0),
+                      (m_next_cached_sp ?
+                       m_next_cached_sp->m_flags :
+                       0)));
   /*
     Check that if there are not any instances after this one then
     pointer to the last instance points on this instance or if there are
@@ -1069,7 +1073,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));    
 
     /*