merge

include/my_sys.h:
  Auto merged
include/myisam.h:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/Makefile.am:
  Auto merged
sql/ha_myisam.h:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_myisammrg.h:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_union.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/structs.h:
  Auto merged

1 files changed, 21 insertions, 7 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index f1308a0de6e..95f238260db 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -53,8 +53,10 @@ const char *ha_table_type[] = {
   "MRG_ISAM","MYISAM", "MRG_MYISAM", "BDB", "INNODB", "GEMINI", "?", "?",NullS
 };
 
-TYPELIB ha_table_typelib= {array_elements(ha_table_type)-4,"",
-			   ha_table_type+1};
+TYPELIB ha_table_typelib=
+{
+  array_elements(ha_table_type)-3, "", ha_table_type
+};
 
 const char *ha_row_type[] = {
   "", "FIXED", "DYNAMIC", "COMPRESSED","?","?","?"
@@ -216,7 +218,7 @@ int ha_autocommit_or_rollback(THD *thd, int error)
     }
     else
       (void) ha_rollback_stmt(thd);
-    thd->tx_isolation=thd->session_tx_isolation;
+    thd->variables.tx_isolation=thd->session_tx_isolation;
   }
 #endif
   DBUG_RETURN(error);
@@ -314,7 +316,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
 #endif /*HAVE_QUERY_CACHE*/
     if (error && trans == &thd->transaction.all && mysql_bin_log.is_open())
       sql_print_error("Error: Got error during commit;  Binlog is not up to date!");
-    thd->tx_isolation=thd->session_tx_isolation;
+    thd->variables.tx_isolation=thd->session_tx_isolation;
     if (operation_done)
     {
       statistic_increment(ha_commit_count,&LOCK_status);
@@ -362,7 +364,7 @@ int ha_rollback_trans(THD *thd, THD_TRANS *trans)
       reinit_io_cache(&thd->transaction.trans_log,
 		      WRITE_CACHE, (my_off_t) 0, 0, 1);
     thd->transaction.trans_log.end_of_file= max_binlog_cache_size;
-    thd->tx_isolation=thd->session_tx_isolation;
+    thd->variables.tx_isolation=thd->session_tx_isolation;
     if (operation_done)
     {
       statistic_increment(ha_rollback_count,&LOCK_status);
@@ -878,8 +880,14 @@ int ha_create_table(const char *name, HA_CREATE_INFO *create_info,
 void ha_key_cache(void)
 {
   if (keybuff_size)
-    (void) init_key_cache(keybuff_size,0);
-} /* ha_key_cache */
+    (void) init_key_cache(keybuff_size);
+}
+
+
+void ha_resize_key_cache(void)
+{
+  (void) resize_key_cache(keybuff_size);
+}
 
 
 static int NEAR_F delete_file(const char *name,const char *ext,int extflag)
@@ -888,3 +896,9 @@ static int NEAR_F delete_file(const char *name,const char *ext,int extflag)
   VOID(fn_format(buff,name,"",ext,extflag | 4));
   return(my_delete_with_symlink(buff,MYF(MY_WME)));
 }
+
+void st_ha_check_opt::init()
+{
+  flags= sql_flags= 0;
+  sort_buffer_size = current_thd->variables.myisam_sort_buff_size;
+}