Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0

into mysql.com:/space/my/mysql-4.0

myisam/myisampack.c

@@ -2047,7 +2047,7 @@ static int save_state(MI_INFO *isam_file,PACK_MRG_INFO *mrg,my_off_t new_length,
   share->state.dellink= HA_OFFSET_ERROR;
   share->state.split=(ha_rows) mrg->records;
   share->state.version=(ulong) time((time_t*) 0);
-  if (share->state.key_map != (1ULL << share->base.keys) - 1)
+  if (share->state.key_map != (((ulonglong)1) << share->base.keys) - 1)
   {
     /*
       Some indexes are disabled, cannot use current key_file_length value

sql/sql_handler.cc

@@ -265,8 +265,6 @@ int mysql_ha_close(THD *thd, TABLE_LIST *tables)
 {
   TABLE_LIST    *hash_tables;
   TABLE         **table_ptr;
-  bool          was_flushed= FALSE;
-  bool          not_opened;
   DBUG_ENTER("mysql_ha_close");
   DBUG_PRINT("enter",("'%s'.'%s' as '%s'",
                       tables->db, tables->real_name, tables->alias));
@@ -363,7 +361,6 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
   int           err;
   int           keyno=-1;
   uint          num_rows;
-  bool          was_flushed;
   MYSQL_LOCK    *lock;
   DBUG_ENTER("mysql_ha_read");
   DBUG_PRINT("enter",("'%s'.'%s' as '%s'",
@@ -615,10 +612,8 @@ err0:
 
 int mysql_ha_flush(THD *thd, TABLE_LIST *tables, uint mode_flags)
 {
-  TABLE_LIST    **tmp_tables_p;
   TABLE_LIST    *tmp_tables;
   TABLE         **table_ptr;
-  bool          was_flushed;
   DBUG_ENTER("mysql_ha_flush");
   DBUG_PRINT("enter", ("tables: %p  mode_flags: 0x%02x", tables, mode_flags));
 
@@ -692,14 +687,13 @@ static int mysql_ha_flush_table(THD *thd, TABLE **table_ptr, uint mode_flags)
 {
   TABLE_LIST    *hash_tables;
   TABLE         *table= *table_ptr;
-  bool          was_flushed;
   DBUG_ENTER("mysql_ha_flush_table");
   DBUG_PRINT("enter",("'%s'.'%s' as '%s'  flags: 0x%02x",
                       table->table_cache_key, table->real_name,
                       table->table_name, mode_flags));
 
   if ((hash_tables= (TABLE_LIST*) hash_search(&thd->handler_tables_hash,
-                                        (*table_ptr)->table_name,
+                                        (byte*) (*table_ptr)->table_name,
                                         strlen((*table_ptr)->table_name) + 1)))
   {
     if (! (mode_flags & MYSQL_HA_REOPEN_ON_USAGE))