Merge mysql.com:/home/svoj/devel/bk/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG26138/mysql-5.1-engines


sql/handler.h:
  Auto merged
sql/sql_table.cc:
  Auto merged
storage/archive/ha_archive.cc:
  SCCS merged
mysql-test/r/archive.result:
  Manually merged.
mysql-test/t/archive.test:
  Manually merged.
storage/example/ha_example.cc:
  Manually merged.

1 files changed, 11 insertions, 0 deletions

diff --git a/sql/handler.h b/sql/handler.h
index 5c42dc670ee..cfa86358fa1 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -1472,6 +1472,17 @@ public:
   virtual void free_foreign_key_create_info(char* str) {}
   /* The following can be called without an open handler */
   virtual const char *table_type() const =0;
+  /*
+    If frm_error() is called then we will use this to find out what file
+    extentions exist for the storage engine. This is also used by the default
+    rename_table and delete_table method in handler.cc.
+
+    For engines that have two file name extentions (separate meta/index file
+    and data file), the order of elements is relevant. First element of engine
+    file name extentions array should be meta/index file extention. Second
+    element - data file extention. This order is assumed by
+    prepare_for_repair() when REPAIR TABLE ... USE_FRM is issued.
+  */
   virtual const char **bas_ext() const =0;
 
   virtual int get_default_no_partitions(HA_CREATE_INFO *info) { return 1;}