bk commit into 4.1 tree (tim:1.2350)

[tim]

Below is the list of changes that have just been committed into a local
4.1 repository of tim. When tim 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.2350 05/07/14 08:11:48 tim@stripped +3 -0
  Merge bk-internal:/home/bk/mysql-4.1
  into  siva.hindu.god:/opt/home/tim/m/41/a

  sql/set_var.cc
    1.168 05/07/14 08:11:41 tim@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.574 05/07/14 08:11:41 tim@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.354 05/07/14 08:11:40 tim@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:	tim
# Host:	siva.hindu.god
# Root:	/opt/home/tim/m/41/a/RESYNC

--- 1.353/sql/mysql_priv.h	2005-06-17 12:07:01 +12:00
+++ 1.354/sql/mysql_priv.h	2005-07-14 08:11:40 +12:00
@@ -251,6 +251,8 @@
 #define UNCACHEABLE_SIDEEFFECT	4
 // forcing to save JOIN for explain
 #define UNCACHEABLE_EXPLAIN     8
+/* Don't evaluate subqueries in prepare even if they're not correlated */
+#define UNCACHEABLE_PREPARE    16
 
 #ifdef EXTRA_DEBUG
 /*
@@ -576,7 +578,8 @@
 			    List<Item> *fields,
 			    SELECT_LEX *select_lex);
 int mysql_prepare_insert(THD *thd, TABLE_LIST *table_list,
-			 TABLE_LIST *insert_table_list, TABLE *table,
+			 TABLE_LIST *insert_table_list,
+                         TABLE_LIST *dup_table_list, TABLE *table,
 			 List<Item> &fields, List_item *values,
 			 List<Item> &update_fields,
 			 List<Item> &update_values, enum_duplicates duplic);
@@ -623,6 +626,7 @@
 extern struct st_des_keyschedule des_keyschedule[10];
 extern uint des_default_key;
 extern pthread_mutex_t LOCK_des_key_file;
+void init_des_key_file();
 bool load_des_key_file(const char *file_name);
 void free_des_key_file();
 #endif /* HAVE_OPENSSL */

--- 1.573/sql/mysqld.cc	2005-06-17 12:07:02 +12:00
+++ 1.574/sql/mysqld.cc	2005-07-14 08:11:41 +12:00
@@ -5154,7 +5154,7 @@
    "Default pointer size to be used for MyISAM tables.",
    (gptr*) &myisam_data_pointer_size,
    (gptr*) &myisam_data_pointer_size, 0, GET_ULONG, REQUIRED_ARG,
-   4, 2, 8, 0, 1, 0},
+   4, 2, 7, 0, 1, 0},
   {"myisam_max_extra_sort_file_size", OPT_MYISAM_MAX_EXTRA_SORT_FILE_SIZE,
    "Used to help MySQL to decide when to use the slow but safe key cache index create method.",
    (gptr*) &global_system_variables.myisam_max_extra_sort_file_size,
@@ -6102,9 +6102,6 @@
 #endif /* HAVE_REPLICATION */
   case (int) OPT_SLOW_QUERY_LOG:
     opt_slow_log=1;
-    break;
-  case (int) OPT_LOG_SLOW_ADMIN_STATEMENTS:
-    opt_log_slow_admin_statements= 1;
     break;
   case (int) OPT_SKIP_NEW:
     opt_specialflag|= SPECIAL_NO_NEW_FUNC;

--- 1.167/sql/set_var.cc	2005-06-17 12:07:02 +12:00
+++ 1.168/sql/set_var.cc	2005-07-14 08:11:41 +12:00
@@ -1520,7 +1520,7 @@
   {
     if (!(res= var->value->val_str(&str)))
     {
-      strmake(buff, "NULL", 4);
+      strmov(buff, "NULL");
       goto err;
     }
     var->save_result.ulong_value= ((ulong)