10.0-base merge

2 files changed, 14 insertions, 36 deletions

diff --git a/storage/csv/ha_tina.cc b/storage/csv/ha_tina.cc
index 916c7b151de..c97cfc57bdb 100644
--- a/storage/csv/ha_tina.cc
+++ b/storage/csv/ha_tina.cc
@@ -136,6 +136,16 @@ static void init_tina_psi_keys(void)
 }
 #endif /* HAVE_PSI_INTERFACE */
 
+/*
+  If frm_error() is called in table.cc this is called to find out what file
+  extensions exist for this handler.
+*/
+static const char *ha_tina_exts[] = {
+  CSV_EXT,
+  CSM_EXT,
+  NullS
+};
+
 static int tina_init_func(void *p)
 {
   handlerton *tina_hton;
@@ -153,6 +163,7 @@ static int tina_init_func(void *p)
   tina_hton->create= tina_create_handler;
   tina_hton->flags= (HTON_CAN_RECREATE | HTON_SUPPORT_LOG_TABLES | 
                      HTON_NO_PARTITION);
+  tina_hton->tablefile_extensions= ha_tina_exts;
   return 0;
 }
 
@@ -825,21 +836,6 @@ err:
 }
 
 /*
-  If frm_error() is called in table.cc this is called to find out what file
-  extensions exist for this handler.
-*/
-static const char *ha_tina_exts[] = {
-  CSV_EXT,
-  CSM_EXT,
-  NullS
-};
-
-const char **ha_tina::bas_ext() const
-{
-  return ha_tina_exts;
-}
-
-/*
   Three functions below are needed to enable concurrent insert functionality
   for CSV engine. For more details see mysys/thr_lock.c
 */
@@ -1413,9 +1409,9 @@ int ha_tina::rnd_end()
       DBUG_RETURN(-1);
 
     /* Open the file again */
-    if (((data_file= mysql_file_open(csv_key_file_data,
-                                     share->data_file_name,
-                                     O_RDONLY, MYF(MY_WME))) == -1))
+    if ((data_file= mysql_file_open(csv_key_file_data,
+                                    share->data_file_name,
+                                    O_RDONLY, MYF(MY_WME))) == -1)
       DBUG_RETURN(my_errno ? my_errno : -1);
     /*
       As we reopened the data file, increase share->data_file_version 
@@ -1754,23 +1750,6 @@ bool ha_tina::check_if_incompatible_data(HA_CREATE_INFO *info,
 struct st_mysql_storage_engine csv_storage_engine=
 { MYSQL_HANDLERTON_INTERFACE_VERSION };
 
-mysql_declare_plugin(csv)
-{
-  MYSQL_STORAGE_ENGINE_PLUGIN,
-  &csv_storage_engine,
-  "CSV",
-  "Brian Aker, MySQL AB",
-  "CSV storage engine",
-  PLUGIN_LICENSE_GPL,
-  tina_init_func, /* Plugin Init */
-  tina_done_func, /* Plugin Deinit */
-  0x0100 /* 1.0 */,
-  NULL,                       /* status variables                */
-  NULL,                       /* system variables                */
-  NULL,                       /* config options                  */
-  0,                          /* flags                           */
-}
-mysql_declare_plugin_end;
 maria_declare_plugin(csv)
 {
   MYSQL_STORAGE_ENGINE_PLUGIN,
diff --git a/storage/csv/ha_tina.h b/storage/csv/ha_tina.h
index 26404b3a9e7..ebf62fbed65 100644
--- a/storage/csv/ha_tina.h
+++ b/storage/csv/ha_tina.h
@@ -103,7 +103,6 @@ public:
     free_root(&blobroot, MYF(0));
   }
   const char *index_type(uint inx) { return "NONE"; }
-  const char **bas_ext() const;
   ulonglong table_flags() const
   {
     return (HA_NO_TRANSACTIONS | HA_REC_NOT_IN_SEQ | HA_NO_AUTO_INCREMENT |