bk commit into 5.1 tree (baker:1.2335)

[Brian Aker]

Below is the list of changes that have just been committed into a local
5.1 repository of baker. When baker 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-02 08:35:55+01:00, baker@stripped +3 -0
  Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
  into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch
  MERGE: 1.2303.1.11

  sql/handler.cc@stripped, 2006-11-02 08:35:50+01:00, baker@stripped +0 -0
    Auto merged
    MERGE: 1.273.1.6

  sql/handler.h@stripped, 2006-11-02 08:35:50+01:00, baker@stripped +0 -0
    Auto merged
    MERGE: 1.244.1.1

  sql/mysqld.cc@stripped, 2006-11-02 08:35:50+01:00, baker@stripped +0 -0
    Auto merged
    MERGE: 1.583.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:	baker
# Host:	bk-internal.mysql.com
# Root:	/data0/bk/mysql-5.1-arch/RESYNC

--- 1.275/sql/handler.cc	2006-11-02 08:36:02 +01:00
+++ 1.276/sql/handler.cc	2006-11-02 08:36:02 +01:00
@@ -2023,16 +2023,27 @@
   /* Write the duplicated key in the error message */
   char key[MAX_KEY_LENGTH];
   String str(key,sizeof(key),system_charset_info);
-  /* Table is opened and defined at this point */
-  key_unpack(&str,table,(uint) key_nr);
-  uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(msg);
-  if (str.length() >= max_length)
+
+  if (key_nr == MAX_KEY)
   {
-    str.length(max_length-4);
-    str.append(STRING_WITH_LEN("..."));
+    /* Key is unknown */
+    str.copy("", 0, system_charset_info);
+    my_printf_error(ER_DUP_ENTRY, msg,
+		    MYF(0), str.c_ptr(), "*UNKNOWN*");
+  }
+  else
+  {
+    /* Table is opened and defined at this point */
+    key_unpack(&str,table,(uint) key_nr);
+    uint max_length=MYSQL_ERRMSG_SIZE-(uint) strlen(msg);
+    if (str.length() >= max_length)
+    {
+      str.length(max_length-4);
+      str.append(STRING_WITH_LEN("..."));
+    }
+    my_printf_error(ER_DUP_ENTRY, msg,
+		    MYF(0), str.c_ptr(), table->key_info[key_nr].name);
   }
-  my_printf_error(ER_DUP_ENTRY, msg,
-                  MYF(0), str.c_ptr(), table->key_info[key_nr].name);
 }
 
 

--- 1.245/sql/handler.h	2006-11-02 08:36:02 +01:00
+++ 1.246/sql/handler.h	2006-11-02 08:36:02 +01:00
@@ -1654,6 +1654,7 @@
 
 /* basic stuff */
 int ha_init(void);
+int ha_end(void);
 int ha_initialize_handlerton(st_plugin_int *plugin);
 int ha_finalize_handlerton(st_plugin_int *plugin);
 

--- 1.585/sql/mysqld.cc	2006-11-02 08:36:02 +01:00
+++ 1.586/sql/mysqld.cc	2006-11-02 08:36:02 +01:00
@@ -4704,7 +4704,6 @@
   OPT_NDB_MGMD, OPT_NDB_NODEID,
   OPT_NDB_DISTRIBUTION,
   OPT_NDB_INDEX_STAT_ENABLE,
-  OPT_NDB_INDEX_STAT_CACHE_ENTRIES, OPT_NDB_INDEX_STAT_UPDATE_FREQ,
   OPT_NDB_EXTRA_LOGGING,
   OPT_NDB_REPORT_THRESH_BINLOG_EPOCH_SLIP,
   OPT_NDB_REPORT_THRESH_BINLOG_MEM_USAGE,
@@ -5414,19 +5413,7 @@
    "Use ndb index statistics in query optimization.",
    (gptr*) &global_system_variables.ndb_index_stat_enable,
    (gptr*) &max_system_variables.ndb_index_stat_enable,
-   0, GET_BOOL, OPT_ARG, 1, 0, 1, 0, 0, 0},
-  {"ndb-index-stat-cache-entries", OPT_NDB_INDEX_STAT_CACHE_ENTRIES,
-   "Number of start/end keys to store in statistics memory cache."
-    " Zero means no cache and forces query of db nodes always.",
-   (gptr*) &global_system_variables.ndb_index_stat_cache_entries,
-   (gptr*) &max_system_variables.ndb_index_stat_cache_entries,
-   0, GET_ULONG, OPT_ARG, 32, 0, ~0L, 0, 0, 0},
-  {"ndb-index-stat-update-freq", OPT_NDB_INDEX_STAT_UPDATE_FREQ,
-   "How often, in the long run, to query db nodes instead of statistics cache."
-   " For example 20 means every 20th time.",
-   (gptr*) &global_system_variables.ndb_index_stat_update_freq,
-   (gptr*) &max_system_variables.ndb_index_stat_update_freq,
-   0, GET_ULONG, OPT_ARG, 20, 0, ~0L, 0, 0, 0},
+   0, GET_BOOL, OPT_ARG, 0, 0, 1, 0, 0, 0},
 #endif
   {"ndb-use-copying-alter-table",
    OPT_NDB_USE_COPYING_ALTER_TABLE,
@@ -7055,7 +7042,7 @@
 #endif
 #ifdef WITH_NDBCLUSTER_STORAGE_ENGINE
   have_ndbcluster=SHOW_OPTION_DISABLED;
-  global_system_variables.ndb_index_stat_enable=TRUE;
+  global_system_variables.ndb_index_stat_enable=FALSE;
   max_system_variables.ndb_index_stat_enable=TRUE;
   global_system_variables.ndb_index_stat_cache_entries=32;
   max_system_variables.ndb_index_stat_cache_entries=~0L;