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

into mashka.mysql.fi:/home/my/mysql-4.1

9 files changed, 31 insertions, 22 deletions

diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp
index 533d4212e2b..54345816884 100644
--- a/VC++Files/mysys/mysys.dsp
+++ b/VC++Files/mysys/mysys.dsp
@@ -190,6 +190,10 @@ SOURCE=.\mf_keycache.c
 # End Source File
 # Begin Source File
 
+SOURCE=.\mf_keycaches.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\mf_loadpath.c
 # End Source File
 # Begin Source File
diff --git a/include/my_base.h b/include/my_base.h
index a1744f37bc6..1bd0f47afa4 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -133,7 +133,7 @@ enum ha_extra_function {
   HA_EXTRA_RETRIEVE_ALL_COLS,
   HA_EXTRA_PREPARE_FOR_DELETE,
   HA_EXTRA_PREPARE_FOR_UPDATE,		/* Remove read cache if problems */
-  HA_EXTRA_PRELOAD_BUFFER_SIZE,         /* Set buffer size for preloading */
+  HA_EXTRA_PRELOAD_BUFFER_SIZE          /* Set buffer size for preloading */
 };
 
 	/* The following is parameter to ha_panic() */
diff --git a/include/my_global.h b/include/my_global.h
index 43cacf8fa65..b5b78774e91 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -688,7 +688,8 @@ typedef long long	my_ptrdiff_t;
 #endif
 #endif
 #if defined(__IBMC__) || defined(__IBMCPP__)
-#define STDCALL _System _Export
+/* This was  _System _Export but caused a lot of warnings on _AIX43 */
+#define STDCALL
 #elif !defined( STDCALL)
 #define STDCALL
 #endif
diff --git a/include/my_sys.h b/include/my_sys.h
index 25c450e5d2b..d1c7b658665 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -160,7 +160,7 @@ extern char *my_strdup_with_length(const byte *from, uint length,
 #endif
 
 #ifdef HAVE_ALLOCA
-#if defined(_AIX) && !defined(__GNUC__)
+#if defined(_AIX) && !defined(__GNUC__) && !defined(_AIX43)
 #pragma alloca
 #endif /* _AIX */
 #if defined(__GNUC__) && !defined(HAVE_ALLOCA_H)
@@ -226,9 +226,8 @@ extern void add_compiled_collation(CHARSET_INFO *cs);
 extern ulong	my_cache_w_requests, my_cache_write, my_cache_r_requests,
 		my_cache_read;
 extern ulong	my_blocks_used, my_blocks_changed;
-extern uint	key_cache_block_size;
 extern ulong	my_file_opened,my_stream_opened, my_tmp_file_created;
-extern my_bool	key_cache_inited, my_init_done;
+extern my_bool	my_init_done;
 
 					/* Point to current my_message() */
 extern void (*my_sigtstp_cleanup)(void),
diff --git a/include/mysql.h b/include/mysql.h
index b31c04c755b..7df42460c6d 100644
--- a/include/mysql.h
+++ b/include/mysql.h
@@ -552,27 +552,27 @@ typedef struct st_mysql_stmt
 
 typedef struct st_mysql_methods
 {
-  my_bool (STDCALL *read_query_result)(MYSQL *mysql);
-  my_bool (STDCALL *advanced_command)(MYSQL *mysql,
+  my_bool (* STDCALL read_query_result)(MYSQL *mysql);
+  my_bool (* STDCALL advanced_command)(MYSQL *mysql,
 				      enum enum_server_command command,
 				      const char *header,
 				      unsigned long header_length,
 				      const char *arg,
 				      unsigned long arg_length,
 				      my_bool skip_check);
-  MYSQL_DATA *(STDCALL *read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
+  MYSQL_DATA *(* STDCALL read_rows)(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
 				   unsigned int fields);
-  MYSQL_RES * (STDCALL *use_result)(MYSQL *mysql);
-  void (STDCALL *fetch_lengths)(unsigned long *to, 
+  MYSQL_RES * (* STDCALL use_result)(MYSQL *mysql);
+  void (* STDCALL fetch_lengths)(unsigned long *to, 
 				MYSQL_ROW column, unsigned int field_count);
 #if !defined(MYSQL_SERVER) || defined(EMBEDDED_LIBRARY)
-  MYSQL_FIELD * (STDCALL *list_fields)(MYSQL *mysql);
-  my_bool (STDCALL *read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
-  int (STDCALL *stmt_execute)(MYSQL_STMT *stmt);
-  MYSQL_DATA *(STDCALL *read_binary_rows)(MYSQL_STMT *stmt);
-  int (STDCALL *unbuffered_fetch)(MYSQL *mysql, char **row);
-  void (STDCALL *free_embedded_thd)(MYSQL *mysql);
-  const char *(STDCALL *read_statistic)(MYSQL *mysql);
+  MYSQL_FIELD * (* STDCALL list_fields)(MYSQL *mysql);
+  my_bool (* STDCALL read_prepare_result)(MYSQL *mysql, MYSQL_STMT *stmt);
+  int (* STDCALL stmt_execute)(MYSQL_STMT *stmt);
+  MYSQL_DATA *(* STDCALL read_binary_rows)(MYSQL_STMT *stmt);
+  int (* STDCALL unbuffered_fetch)(MYSQL *mysql, char **row);
+  void (* STDCALL free_embedded_thd)(MYSQL *mysql);
+  const char *(* STDCALL read_statistic)(MYSQL *mysql);
 #endif
 } MYSQL_METHODS;
 
diff --git a/innobase/fil/fil0fil.c b/innobase/fil/fil0fil.c
index a9ae59fbd50..7cf3cc409b3 100644
--- a/innobase/fil/fil0fil.c
+++ b/innobase/fil/fil0fil.c
@@ -1567,7 +1567,7 @@ fil_op_write_log(
 	
 	mlog_close(mtr, log_ptr);
 
-	mlog_catenate_string(mtr, name, ut_strlen(name) + 1);
+	mlog_catenate_string(mtr, (byte*) name, ut_strlen(name) + 1);
 
 	if (type == MLOG_FILE_RENAME) {
 		log_ptr = mlog_open(mtr, 30);
@@ -1576,7 +1576,7 @@ fil_op_write_log(
 	
 		mlog_close(mtr, log_ptr);
 
-		mlog_catenate_string(mtr, new_name, ut_strlen(new_name) + 1);
+		mlog_catenate_string(mtr, (byte*) new_name, ut_strlen(new_name) + 1);
 	}
 }
 #endif
@@ -1630,7 +1630,7 @@ fil_op_log_parse_or_replay(
 		return(NULL);
 	}
 
-	name = ptr;
+	name = (char*) ptr;
 
 	ptr += name_len;
 
@@ -1649,7 +1649,7 @@ fil_op_log_parse_or_replay(
 			return(NULL);
 		}
 
-		new_name = ptr;
+		new_name = (char*) ptr;
 
 		ptr += new_name_len;
 	}
diff --git a/libmysql/libmysql.c b/libmysql/libmysql.c
index eb57e433c44..4f0a6aef11b 100644
--- a/libmysql/libmysql.c
+++ b/libmysql/libmysql.c
@@ -2990,7 +2990,8 @@ int STDCALL cli_unbuffered_fetch(MYSQL *mysql, char **row)
   if (packet_error == net_safe_read(mysql))
     return 1;
 
-  *row= (mysql->net.read_pos[0] == 254) ? NULL : (mysql->net.read_pos+1);
+  *row= ((mysql->net.read_pos[0] == 254) ? NULL :
+	 (char*) (mysql->net.read_pos+1));
   return 0;
 }
 
diff --git a/sql/set_var.h b/sql/set_var.h
index a4c3b546fe0..666575a75e4 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -791,3 +791,6 @@ gptr find_named(I_List<NAMED_LIST> *list, const char *name, uint length,
 KEY_CACHE_VAR *get_key_cache(LEX_STRING *cache_name);
 KEY_CACHE_VAR *get_or_create_key_cache(const char *name, uint length);
 void free_key_cache(const char *name, KEY_CACHE_VAR *key_cache);
+bool process_key_caches(int (* func) (const char *name, KEY_CACHE_VAR *));
+void delete_elements(I_List<NAMED_LIST> *list,
+		     void (*free_element)(const char*, gptr));
diff --git a/strings/my_strtoll10.c b/strings/my_strtoll10.c
index f795ef64728..117b9d16a65 100644
--- a/strings/my_strtoll10.c
+++ b/strings/my_strtoll10.c
@@ -18,6 +18,7 @@
 #include <my_sys.h>
 #include <m_string.h>
 
+#undef  ULONGLONG_MAX
 #define ULONGLONG_MAX		(~(ulonglong) 0)
 #define MAX_NEGATIVE_NUMBER	((ulonglong) LL(0x8000000000000000))
 #define INIT_CNT  9