Fix to use Monty's changes in frm format

Enable latin1 by default

1 files changed, 11 insertions, 2 deletions

diff --git a/sql/table.cc b/sql/table.cc
index 122357a1fb1..7e4faa1ba7c 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -201,6 +201,13 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
     for (i=0 ; i < keys ; i++, keyinfo++)
       keyinfo->algorithm= (enum ha_key_alg) *(strpos++);
   }
+  else
+  {
+    /* Set key types to BTREE, BAR TODO: how to be with HASH/RBTREE? */
+    keyinfo=outparam->key_info;
+    for (i=0 ; i < keys ; i++, keyinfo++)
+      keyinfo->algorithm= HA_KEY_ALG_BTREE;
+  }
   outparam->reclength = uint2korr((head+16));
   if (*(head+26) == 1)
     outparam->system=1;				/* one-record-database */
@@ -408,10 +415,12 @@ int openfrm(const char *name, const char *alias, uint db_stat, uint prgflag,
 	}
       }
 
-      keyinfo->key_alg=HA_KEY_ALG_BTREE;  // BAR : btree by default
+      if (keyinfo->name[0]=='S')
+	keyinfo->flags |= HA_SPATIAL;
 
-#define BAR_DIRTY_HACK
 #ifdef BAR_DIRTY_HACK
+      keyinfo->key_alg=HA_KEY_ALG_BTREE;  // BAR : btree by default
+
       // BAR FIXME: Dirty hack while waiting for new .frm format
       switch(keyinfo->name[0]){
         case 'R':