Merge bk-internal.mysql.com:/home/bk/mysql-5.1

into  mysql.com:/home/my/mysql-5.1


configure.in:
  Auto merged
client/mysql.cc:
  Auto merged
include/m_ctype.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_strfunc.h:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_string.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/table.cc:
  Auto merged
sql/table.h:
  Auto merged
storage/myisam/mi_rkey.c:
  Auto merged
client/mysqldump.c:
  Manual merge (trivial)
scripts/mysql_install_db.sh:
  Complex merge (parital rewrite of new code)
sql/sql_show.cc:
  Manual merge
tests/mysql_client_test.c:
  then
    if ! test -x "$print_defaults"
    then
      missing_in_basedir my_print_defaults
      exit 1
    fi
  else

3 files changed, 17 insertions, 11 deletions

diff --git a/include/m_ctype.h b/include/m_ctype.h
index a165963f2a8..9025507ce15 100644
--- a/include/m_ctype.h
+++ b/include/m_ctype.h
@@ -170,6 +170,14 @@ extern MY_COLLATION_HANDLER my_collation_8bit_bin_handler;
 extern MY_COLLATION_HANDLER my_collation_8bit_simple_ci_handler;
 extern MY_COLLATION_HANDLER my_collation_ucs2_uca_handler;
 
+/* Some typedef to make it easy for C++ to make function pointers */
+typedef int (*my_charset_conv_mb_wc)(struct charset_info_st *, my_wc_t *,
+                                     const uchar *, const uchar *);
+typedef int (*my_charset_conv_wc_mb)(struct charset_info_st *, my_wc_t,
+                                     uchar *, uchar *);
+typedef size_t (*my_charset_conv_case)(struct charset_info_st *,
+                                       char *, size_t, char *, size_t);
+
 
 /* See strings/CHARSET_INFO.txt about information on this structure  */
 typedef struct my_charset_handler_st
@@ -188,11 +196,9 @@ typedef struct my_charset_handler_st
   size_t  (*numcells)(struct charset_info_st *, const char *b, const char *e);
   
   /* Unicode conversion */
-  int (*mb_wc)(struct charset_info_st *cs,my_wc_t *wc,
-	       const uchar *s,const uchar *e);
-  int (*wc_mb)(struct charset_info_st *cs,my_wc_t wc,
-	       uchar *s,uchar *e);
-  
+  my_charset_conv_mb_wc mb_wc;
+  my_charset_conv_wc_mb wc_mb;
+
   /* CTYPE scanner */
   int (*ctype)(struct charset_info_st *cs, int *ctype,
                const uchar *s, const uchar *e);
@@ -200,11 +206,10 @@ typedef struct my_charset_handler_st
   /* Functions for case and sort conversion */
   size_t  (*caseup_str)(struct charset_info_st *, char *);
   size_t  (*casedn_str)(struct charset_info_st *, char *);
-  size_t  (*caseup)(struct charset_info_st *, char *src, size_t srclen,
-                    char *dst, size_t dstlen);
-  size_t  (*casedn)(struct charset_info_st *, char *src, size_t srclen,
-                    char *dst, size_t dstlen);
-  
+
+  my_charset_conv_case caseup;
+  my_charset_conv_case casedn;
+
   /* Charset dependant snprintf() */
   size_t (*snprintf)(struct charset_info_st *, char *to, size_t n,
                      const char *fmt,
diff --git a/include/my_sys.h b/include/my_sys.h
index 76c9a7f02c7..2ce36760032 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -225,6 +225,7 @@ extern CHARSET_INFO compiled_charsets[];
 
 /* statistics */
 extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;
+extern ulong    my_file_total_opened;
 extern uint	mysys_usage_id;
 extern my_bool	my_init_done;
 
diff --git a/include/myisam.h b/include/myisam.h
index 5d93ded3d6e..6a76a298dee 100644
--- a/include/myisam.h
+++ b/include/myisam.h
@@ -455,7 +455,7 @@ typedef struct st_sort_info
   enum data_file_type new_data_file_type;
   MI_INFO *info;
   MI_CHECK *param;
-  char *buff;
+  uchar *buff;
   SORT_KEY_BLOCKS *key_block,*key_block_end;
   SORT_FT_BUF *ft_buf;
   /* sync things */