bk commit into 5.0 tree (dlenev:1.2299)

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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@stripped, 2006-11-01 16:20:15+03:00, dlenev@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0-runtime
  into  mockturtle.local:/home/dlenev/src/mysql-5.0-hash-2
  MERGE: 1.2290.2.2

  sql/sql_lex.cc@stripped, 2006-11-01 16:20:11+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.202.1.1

  sql/sql_lex.h@stripped, 2006-11-01 16:20:12+03:00, dlenev@stripped +0 -0
    Auto merged
    MERGE: 1.229.1.1

# 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:	dlenev
# Host:	mockturtle.local
# Root:	/home/dlenev/src/mysql-5.0-hash-2/RESYNC

--- 1.203/sql/sql_lex.cc	2006-11-01 16:20:20 +03:00
+++ 1.204/sql/sql_lex.cc	2006-11-01 16:20:20 +03:00
@@ -1634,9 +1634,18 @@
   query_tables_last= &query_tables;
   query_tables_own_last= 0;
   if (init)
-    hash_init(&sroutines, system_charset_info, 0, 0, 0, sp_sroutine_key, 0, 0);
+  {
+    /*
+      We delay real initialization of hash (and therefore related
+      memory allocation) until first insertion into this hash.
+    */
+    hash_clear(&sroutines);
+  }
   else if (sroutines.records)
+  {
+    /* Non-zero sroutines.records means that hash was initialized. */
     my_hash_reset(&sroutines);
+  }
   sroutines_list.empty();
   sroutines_list_own_last= sroutines_list.next;
   sroutines_list_own_elements= 0;

--- 1.230/sql/sql_lex.h	2006-11-01 16:20:20 +03:00
+++ 1.231/sql/sql_lex.h	2006-11-01 16:20:20 +03:00
@@ -743,7 +743,11 @@
     0 - indicates that this query does not need prelocking.
   */
   TABLE_LIST **query_tables_own_last;
-  /* Set of stored routines called by statement. */
+  /*
+    Set of stored routines called by statement.
+    (Note that we use lazy-initialization for this hash).
+  */
+  enum { START_SROUTINES_HASH_SIZE= 16 };
   HASH sroutines;
   /*
     List linking elements of 'sroutines' set. Allows you to add new elements