CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS

New multi-key-cache handling. This was needed becasue the old one didn't work reliable with MERGE tables.
ALTER TABLE table_name ... CHARACTER SET  ... now changes all char/varchar/text columns to the given character set
(One must use ALTER TABLE ... DEFAULT CHARACTER SET ... to change the default character set)
Fixed that have_compress is detected properly (fixes problems with func_compress.test on platforms without zlib)
New syntax for CACHE INDEX ('keys' is optional if no index name is given and one mentions the key cache name only ones)
Removed compiler warnings
Added mysql_set_server_option() to allow clients like PHP to easaily set/reset the multi-statement flag.


BUILD/compile-pentium-valgrind-max:
  Add test of isam
client/mysql.cc:
  CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
include/my_base.h:
  Remove HA_EXTRA_SET_KEY_CACHE
include/my_no_pthread.h:
  Add defines to ignore rw-locks when running without threads
include/my_sys.h:
  Added function for multi-key-caches
include/myisam.h:
  Added function to handle multi-key-caches
include/mysql.h:
  Added mysql_set_server_option
include/mysql_com.h:
  CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
  Added enum_mysql_set_option
include/mysqld_error.h:
  Added error message for unknown key cache
innobase/srv/srv0start.c:
  Removed warning that is confused for MySQL users
libmysql/libmysql.c:
  Added mysql_set_server_option()
libmysql/libmysql.def:
  Added mysql_set_server_option()
myisam/ft_nlq_search.c:
  Removed compiler warning
myisam/ft_static.c:
  Removed compiler warning and fixed wrong return value
myisam/mi_check.c:
  Clean up multi-key-cache usage
myisam/mi_checksum.c:
  Removed not used variable
myisam/mi_close.c:
  keycache -> key_cache
myisam/mi_delete_all.c:
  keycache -> key_cache
myisam/mi_extra.c:
  keycache -> key_cache
  Removed HA_EXTRA_SET_KEY_CACHE
myisam/mi_keycache.c:
  Changed logic so that it's MyISAM that is responsible for assign tables to different key caches instead of the upper level
myisam/mi_locking.c:
  Don't change key cache on unlock (must be done before)
myisam/mi_open.c:
  Fetch key cache to use from multi_key_cache_search()
myisam/mi_page.c:
  keycache -> key_cache
myisam/mi_panic.c:
  keycache -> key_cache
myisam/mi_preload.c:
  keycache -> key_cache
myisam/mi_test1.c:
  Use KEY_CACHE_BLOCK_SIZE
myisam/mi_test2.c:
  Always test resize_key_cache()
myisam/mi_test3.c:
  Use KEY_CACHE_BLOCK_SIZE instead of 512
myisam/myisamchk.c:
  update for multiple key caches
myisam/myisamdef.h:
  Remove reg_keycache
  Add unique_name_length for storing length of unique_file_name
myisam/myisamlog.c:
  Change how end_key_cache() is called
mysql-test/mysql-test-run.sh:
  Fixed web link
  Added name of failed test to abort row.
mysql-test/r/alter_table.result:
  Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET
mysql-test/r/case.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/cast.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/create.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/ctype_collate.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/ctype_latin1_de.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/ctype_many.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/ctype_mb.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/ctype_recoding.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/ctype_ucs.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/derived.result:
  Use STRAIGHT_JOIN to make join order predictable
mysql-test/r/fulltext.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/func_str.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/func_system.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/gis-rtree.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/innodb.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/key_cache.result:
  Update test for new key cache syntax.
  Added more tests
mysql-test/r/merge.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/preload.result:
  New syntax
mysql-test/r/show_check.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/sql_mode.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/subselect.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/type_blob.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/type_enum.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/type_nchar.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/type_set.result:
  Update result for DEFAULT CHARSET...
mysql-test/r/union.result:
  Use STRAIGHT_JOIN to make join order predictable
mysql-test/t/alter_table.test:
  Testing of ALTER TABLE ... [DEFAULT] CHARACTER SET
mysql-test/t/ctype_many.test:
  Update result for DEFAULT CHARSET...
mysql-test/t/derived.test:
  Use STRAIGHT_JOIN to make join order predictable
mysql-test/t/isam.test:
  Use disable warnings for test loop
mysql-test/t/join.test:
  Update test now when we only support 61 tables in join
mysql-test/t/key_cache.test:
  Update test for new key cache syntax.
  Added more tests
mysql-test/t/preload.test:
  Update for new syntax
mysql-test/t/union.test:
  Use STRAIGHT_JOIN to make join order predictable
mysys/Makefile.am:
  Added mf_keycaches.c
mysys/hash.c:
  TRUE -> 1
mysys/mf_keycache.c:
  Removed compiler warnings
  Striped end space
  Fixed indentation and improved function comments
  TRUE -> 1
  Changed parameters to end_key_cache() to make it easer to use
  Fixed bug when using key blocks size > 1024 bytes (First part of index file could be overwritten with wrong data)
  Split function flush_key_blocks into two functions to not get mutex used twice when called from flush_all_key_blocks()
mysys/my_bitmap.c:
  More debugging
  Safe bitmap_free()
  Fixed indentation
mysys/my_getopt.c:
  Ensure that we initialize option->value, option->max_value and value from GET_ASK_ADDR
mysys/my_thr_init.c:
  Remove not used mutex THR_LOCK_keycache
mysys/typelib.c:
  Fixed function comments
sql-common/client.c:
  CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
  Fixed the multi_result flag is set also on SELECT;s
sql/ha_myisam.cc:
  Fixed multiple key_cache handling
  (Now done on MyISAM level)
sql/ha_myisammrg.cc:
  Fixed multiple key_cache handling
  (Now done on MyISAM level)
sql/handler.cc:
  New multi key cache handling
sql/handler.h:
  New multi key cache handling
  Added support for default character set
sql/item.h:
  Added function cleanup() (Needed for prepared statements / cursors)
sql/item_cmpfunc.h:
  Added cleanup function
sql/item_func.cc:
  Indentation cleanup
sql/mysql_priv.h:
  New multi-key-cache functions
  Removed LOCK_assign
sql/mysqld.cc:
  New multi-key-cache handling
  Fixed that variable have_compress is set correctly
sql/protocol.cc:
  SELECT didn't work reliable in multi-statements
sql/set_var.cc:
  Support for new key cache variables
sql/set_var.h:
  Support for new key cache variables
sql/share/czech/errmsg.txt:
  New error messages
sql/share/danish/errmsg.txt:
  New error messages
sql/share/dutch/errmsg.txt:
  New error messages
sql/share/english/errmsg.txt:
  New error messages
sql/share/estonian/errmsg.txt:
  New error messages
sql/share/french/errmsg.txt:
  New error messages
sql/share/german/errmsg.txt:
  New error messages
sql/share/greek/errmsg.txt:
  New error messages
sql/share/hungarian/errmsg.txt:
  New error messages
sql/share/italian/errmsg.txt:
  New error messages
sql/share/japanese/errmsg.txt:
  New error messages
sql/share/korean/errmsg.txt:
  New error messages
sql/share/norwegian-ny/errmsg.txt:
  New error messages
sql/share/norwegian/errmsg.txt:
  New error messages
sql/share/polish/errmsg.txt:
  New error messages
sql/share/portuguese/errmsg.txt:
  New error messages
sql/share/romanian/errmsg.txt:
  New error messages
sql/share/russian/errmsg.txt:
  New error messages
sql/share/serbian/errmsg.txt:
  New error messages
sql/share/slovak/errmsg.txt:
  New error messages
sql/share/spanish/errmsg.txt:
  New error messages
sql/share/swedish/errmsg.txt:
  New error messages
sql/share/ukrainian/errmsg.txt:
  New error messages
sql/sql_base.cc:
  Removed all key_cache handling (this is now done on MyISAM level)
  Change table_charset -> default_table_charset
sql/sql_db.cc:
  table_charset -> default_table_charset
sql/sql_delete.cc:
  table_charset -> default_table_charset
sql/sql_lex.cc:
  CLIENT_MULTI_QUERIES -> CLIENT_MULTI_STATEMENTS
sql/sql_lex.h:
  New option to store a name and length
sql/sql_parse.cc:
  Support for mysql_set_server_option()
  Reset "default" keycache status variables in 'FLUSH STATUS' (Need to be improved later)
sql/sql_show.cc:
  Add DEFAULT before CHARSET (for table character sets)
  Fetch key cache variables from 'sql_key_cache'
sql/sql_table.cc:
  table_charset -> default_table_charset
  New multi-key-cache handling
sql/sql_test.cc:
  Write information from all key caches
sql/sql_yacc.yy:
  Changed syntax for CACHE INDEX ...
  Force user to use DEFAULT before database/table level character sets
sql/structs.h:
  Added SHOW_KEY_CACHE_LONG (to get values from sql_key_cache)
sql/table.cc:
  table_charset -> default_table_charset
sql/table.h:
  New key cache handling (this is now done in mysys/mf_keycaches.c)
sql/unireg.h:
  A

1 files changed, 26 insertions, 134 deletions

diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 3976ebd81f4..9fe61ae19e1 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -35,6 +35,7 @@ HASH assign_cache;
 static int open_unireg_entry(THD *thd,TABLE *entry,const char *db,
 			     const char *name, const char *alias);
 static void free_cache_entry(TABLE *entry);
+static void free_assign_entry(KEY_CACHE_ASMT *key_cache_asmt);
 static void mysql_rm_tmp_tables(void);
 
 
@@ -142,7 +143,8 @@ OPEN_TABLE_LIST *list_open_tables(THD *thd, const char *wild)
     OPEN_TABLE_LIST *table;
     TABLE *entry=(TABLE*) hash_element(&open_cache,idx);
 
-    if ((!entry->real_name))
+    DBUG_ASSERT(entry->real_name);
+    if ((!entry->real_name))			// To be removed
       continue;					// Shouldn't happen
     if (wild)
     {
@@ -772,8 +774,6 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
   reg1	TABLE *table;
   char	key[MAX_DBKEY_LENGTH];
   uint	key_length;
-  KEY_CACHE_ASMT *key_cache_asmt;
-  KEY_CACHE_VAR *key_cache;
   DBUG_ENTER("open_table");
 
   /* find a unused table in the open table cache */
@@ -816,76 +816,6 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
     DBUG_RETURN(0);
   }
 
-  VOID(pthread_mutex_lock(&LOCK_assign));
-  key_cache_asmt= (KEY_CACHE_ASMT*) hash_search(&assign_cache,
-                                              (byte*) key, key_length) ;
-  if (thd->open_options & HA_OPEN_TO_ASSIGN)
-  { 
-    /* When executing a CACHE INDEX command*/   
-    if (key_cache_asmt)
-    {
-      if (key_cache_asmt->requests++)
-      { 
-        /* Another thread are assigning this table to some key cache*/
-
-        /* Put the assignment request into the queue of such requests */
-        struct st_my_thread_var *last;
-        struct st_my_thread_var *thread= thd->mysys_var;        
-        if (! (last= key_cache_asmt->queue))
-          thread->next= thread;
-        else
-        {
-          thread->next= last->next;
-          last->next= thread;
-        }
-        key_cache_asmt->queue= thread;
-        
-        /* Wait until the request can be processed */
-        do
-        {
-          VOID(pthread_cond_wait(&thread->suspend, &LOCK_assign));
-        }
-        while (thread->next);
-      }
-    }
-    else
-    {
-      /* 
-         The table has not been explicitly assigned to any key cache yet;
-         by default it's assigned to the default key cache;
-      */
-      
-      if (!(key_cache_asmt=
-              (KEY_CACHE_ASMT *) my_malloc(sizeof(*key_cache_asmt),
-					   MYF(MY_WME | MY_ZEROFILL)))      ||
-          !(key_cache_asmt->db_name= my_strdup(db, MYF(MY_WME)))            ||
-	  !(key_cache_asmt->table_name= my_strdup(table_name, MYF(MY_WME))) ||
-          !(key_cache_asmt->table_key= my_memdup((const byte *) key,
-						 key_length, MYF(MY_WME))))
-      {
-        VOID(pthread_mutex_unlock(&LOCK_assign));
-        
-        if (key_cache_asmt)
-        {
-          if (key_cache_asmt->db_name)
-            my_free((gptr) key_cache_asmt->db_name, MYF(0));
-          if (key_cache_asmt->table_name)
-            my_free((gptr) key_cache_asmt->table_name, MYF(0));
-          my_free((gptr) key_cache_asmt, MYF(0));
-        }
-        DBUG_RETURN(NULL);
-      }
-      key_cache_asmt->key_length= key_length;
-      key_cache_asmt->key_cache= &dflt_key_cache_var;  
-      VOID(my_hash_insert(&assign_cache, (byte *) key_cache_asmt));
-      key_cache_asmt->requests++;     
-    }
-    key_cache_asmt->to_reassign= 0;
-  }
-
-  key_cache= key_cache_asmt ? key_cache_asmt->key_cache : &dflt_key_cache_var;  
-  VOID(pthread_mutex_unlock(&LOCK_assign));
-
   VOID(pthread_mutex_lock(&LOCK_open));
 
   if (!thd->open_tables)
@@ -929,8 +859,6 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
     table->prev->next=table->next;		/* Remove from unused list */
     table->next->prev=table->prev;
 
-    table->key_cache= key_cache;
-    table->key_cache_asmt= key_cache_asmt;
   }
   else
   {
@@ -944,8 +872,6 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
       VOID(pthread_mutex_unlock(&LOCK_open));
       DBUG_RETURN(NULL);
     }
-    table->key_cache= key_cache;
-    table->key_cache_asmt= key_cache_asmt;
     if (open_unireg_entry(thd, table,db,table_name,alias) ||
 	!(table->table_cache_key=memdup_root(&table->mem_root,(char*) key,
 					     key_length)))
@@ -963,8 +889,7 @@ TABLE *open_table(THD *thd,const char *db,const char *table_name,
   }
 
   table->in_use=thd;
-  check_unused();
-
+  check_unused();				// Debugging call
        
   VOID(pthread_mutex_unlock(&LOCK_open));
   if (refresh)
@@ -1071,8 +996,8 @@ bool reopen_table(TABLE *table,bool locked)
   tmp.grant=		table->grant;
 
   /* Replace table in open list */
-  tmp.next=table->next;
-  tmp.prev=table->prev;
+  tmp.next=		table->next;
+  tmp.prev=		table->prev;
 
   if (table->file)
     VOID(closefrm(table));		// close file, free everything
@@ -1740,54 +1665,6 @@ bool rm_temporary_table(enum db_type base, char *path)
   DBUG_RETURN(error);
 }
 
-static void free_assign_entry(KEY_CACHE_ASMT *key_cache_asmt)
-{
-  DBUG_ENTER("free_assign_entry");
-  my_free((gptr) key_cache_asmt->table_key, MYF(0));
-  my_free((gptr) key_cache_asmt, MYF(0));
-  DBUG_VOID_RETURN;
-}
-
-static byte *assign_cache_key(const byte *record,uint *length,
-				 my_bool not_used __attribute__((unused)))
-{
-  KEY_CACHE_ASMT *entry=(KEY_CACHE_ASMT *) record;
-  *length=entry->key_length;
-  return (byte*) entry->table_key;
-}
-
-void assign_cache_init(void)
-{
-  VOID(hash_init(&assign_cache, &my_charset_bin,
-		 table_cache_size+16, 0, 0, assign_cache_key,
-		 (hash_free_key) free_assign_entry,0));
-}
-
-void assign_cache_free(void)
-{
-  DBUG_ENTER("assign_cache_free");
-  hash_free(&assign_cache);
-  DBUG_VOID_RETURN;
-}
-
-void reassign_key_cache(KEY_CACHE_ASMT *key_cache_asmt,
-                        KEY_CACHE_VAR *new_key_cache)
-{
-  if (key_cache_asmt->prev)
-  { 
-    /* Unlink key_cache_asmt from the assignment list for the old key cache */
-    if ((*key_cache_asmt->prev= key_cache_asmt->next))
-      key_cache_asmt->next->prev= key_cache_asmt->prev;
-  }
-  /* Link key_cache_asmt into the assignment list for the new key cache */
-  key_cache_asmt->prev= &new_key_cache->assign_list;
-  if ((key_cache_asmt->next= new_key_cache->assign_list))
-    key_cache_asmt->next->prev= &key_cache_asmt->next;
-  new_key_cache->assign_list= key_cache_asmt;
-
-  key_cache_asmt->key_cache= new_key_cache;
-}
-
 
 /*****************************************************************************
 ** find field in list or tables. if field is unqualifed and unique,
@@ -2215,7 +2092,21 @@ bool setup_tables(TABLE_LIST *tables)
 }
 
 
-void get_key_map_from_key_list(key_map *map, TABLE *table,
+/*
+   Create a key_map from a list of index names
+
+   SYNOPSIS
+     get_key_map_from_key_list()
+     map		key_map to fill in
+     table		Table
+     index_list		List of index names
+
+   RETURN
+     0	ok;  In this case *map will includes the choosed index
+     1	error
+*/
+
+bool get_key_map_from_key_list(key_map *map, TABLE *table,
                                List<String> *index_list)
 {
   List_iterator_fast<String> it(*index_list);
@@ -2231,13 +2122,14 @@ void get_key_map_from_key_list(key_map *map, TABLE *table,
       my_error(ER_KEY_COLUMN_DOES_NOT_EXITS, MYF(0), name->c_ptr(),
 	       table->real_name);
       map->set_all();
-      return;
+      return 1;
     }
     map->set_bit(pos-1);
   }
-  return;
+  return 0;
 }
 
+
 /****************************************************************************
   This just drops in all fields instead of current '*' field
   Returns pointer to last inserted field if ok
@@ -2488,7 +2380,7 @@ int mysql_create_index(THD *thd, TABLE_LIST *table_list, List<Key> &keys)
   DBUG_ENTER("mysql_create_index");
   bzero((char*) &create_info,sizeof(create_info));
   create_info.db_type=DB_TYPE_DEFAULT;
-  create_info.table_charset= thd->variables.collation_database;
+  create_info.default_table_charset= thd->variables.collation_database;
   DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->real_name,
 				&create_info, table_list,
 				fields, keys, drop, alter, 0, (ORDER*)0, FALSE,
@@ -2505,7 +2397,7 @@ int mysql_drop_index(THD *thd, TABLE_LIST *table_list, List<Alter_drop> &drop)
   DBUG_ENTER("mysql_drop_index");
   bzero((char*) &create_info,sizeof(create_info));
   create_info.db_type=DB_TYPE_DEFAULT;
-  create_info.table_charset= thd->variables.collation_database;
+  create_info.default_table_charset= thd->variables.collation_database;
   DBUG_RETURN(mysql_alter_table(thd,table_list->db,table_list->real_name,
 				&create_info, table_list,
 				fields, keys, drop, alter, 0, (ORDER*)0, FALSE,