Merge zim.(none):/home/brian/mysql/merge-5.1

into  zim.(none):/home/brian/mysql/arch-5.1


sql/mysql_priv.h:
  Auto merged
sql/share/errmsg.txt:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/handler.h:
  Merge from G's work
sql/sql_cursor.cc:
  Merge from G's work
storage/csv/ha_tina.cc:
  Merge of G's work
storage/innobase/handler/ha_innodb.cc:
  Merge of G's work
storage/innobase/handler/ha_innodb.h:
  Merge of G's work
storage/myisam/ha_myisam.cc:
  Merge of G's work

2 files changed, 17 insertions, 11 deletions

diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index b9fdfc1ae0c..8f090470f49 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -74,7 +74,11 @@ static int write_meta_file(File meta_file, ha_rows rows, bool dirty);
 pthread_mutex_t tina_mutex;
 static HASH tina_open_tables;
 static int tina_init= 0;
-static handler *tina_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root);
+static handler *tina_create_handler(handlerton *hton,
+                                    TABLE_SHARE *table, 
+                                    MEM_ROOT *mem_root);
+int tina_end(handlerton *hton, ha_panic_function type);
+
 
 off_t Transparent_file::read_next()
 {
@@ -123,7 +127,6 @@ char Transparent_file::get_value(off_t offset)
     return buff[0];
   }
 }
-handlerton *tina_hton;
 
 /*****************************************************************************
  ** TINA tables
@@ -150,6 +153,8 @@ static byte* tina_get_key(TINA_SHARE *share,uint *length,
 
 static int tina_init_func(void *p)
 {
+  handlerton *tina_hton;
+
   if (!tina_init)
   {
     tina_hton= (handlerton *)p;
@@ -161,7 +166,8 @@ static int tina_init_func(void *p)
     tina_hton->db_type= DB_TYPE_CSV_DB;
     tina_hton->create= tina_create_handler;
     tina_hton->panic= tina_end;
-    tina_hton->flags= HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES;
+    tina_hton->flags= (HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES | 
+                       HTON_NO_PARTITION);
   }
   return 0;
 }
@@ -449,7 +455,7 @@ static int free_share(TINA_SHARE *share)
   DBUG_RETURN(result_code);
 }
 
-int tina_end(ha_panic_function type)
+int tina_end(handlerton *hton, ha_panic_function type)
 {
   return tina_done_func(NULL);
 }
@@ -493,14 +499,16 @@ off_t find_eoln_buff(Transparent_file *data_buff, off_t begin,
 }
 
 
-static handler *tina_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
+static handler *tina_create_handler(handlerton *hton,
+                                    TABLE_SHARE *table, 
+                                    MEM_ROOT *mem_root)
 {
-  return new (mem_root) ha_tina(table);
+  return new (mem_root) ha_tina(hton, table);
 }
 
 
-ha_tina::ha_tina(TABLE_SHARE *table_arg)
-  :handler(tina_hton, table_arg),
+ha_tina::ha_tina(handlerton *hton, TABLE_SHARE *table_arg)
+  :handler(hton, table_arg),
   /*
     These definitions are found in handler.h
     They are not probably completely right.
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 14ca848c855..f408e8f4a7d 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.h
@@ -129,7 +129,7 @@ private:
   int init_tina_writer();
 
 public:
-  ha_tina(TABLE_SHARE *table_arg);
+  ha_tina(handlerton *hton, TABLE_SHARE *table_arg);
   ~ha_tina()
   {
     if (chain_alloced)
@@ -212,5 +212,3 @@ public:
   int chain_append();
 };
 
-int tina_end(ha_panic_function type);
-