diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index f8dd043ff10877778ee6f5bc2a5222970a9f9251..d6ab5ae31801c3aa816336425b1464c6027767b5 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -164,6 +164,7 @@ paul@frost.snake.net
 paul@ice.local
 paul@ice.snake.net
 paul@kite-hub.kitebird.com
+paul@snake-hub.snake.net
 paul@teton.kitebird.com
 pekka@mysql.com
 pem@mysql.com
diff --git a/myisam/mi_check.c b/myisam/mi_check.c
index f7e7ffd42f626dcaaf683413e2c2223e1ad4b62c..0123278a23fa2539994af2f8bcfefefe37bfc3fb 100644
--- a/myisam/mi_check.c
+++ b/myisam/mi_check.c
@@ -1466,12 +1466,14 @@ static int writekeys(MI_CHECK *param, register MI_INFO *info, byte *buff,
         if (_mi_ft_add(info,i,(char*) key,buff,filepos))
 	  goto err;
       }
+#ifdef HAVE_SPATIAL
       else if (info->s->keyinfo[i].flag & HA_SPATIAL)
       {
 	uint key_length=_mi_make_key(info,i,key,buff,filepos);
 	if (rtree_insert(info, i, key, key_length))
 	  goto err;
       }
+#endif /*HAVE_SPATIAL*/
       else
       {
 	uint key_length=_mi_make_key(info,i,key,buff,filepos);
diff --git a/sql/set_var.cc b/sql/set_var.cc
index e39d99342788311c92404468f77d6be4fb38d5b1..082c55db1884b4cf80240e624a005664b51a3b77 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -2948,7 +2948,7 @@ bool sys_var_thd_storage_engine::check(THD *thd, set_var *var)
     enum db_type db_type;
     if (!(res=var->value->val_str(&str)) ||
 	!(var->save_result.ulong_value=
-	 (ulong) db_type= ha_resolve_by_name(res->ptr(), res->length())) ||
+	 (ulong) (db_type= ha_resolve_by_name(res->ptr(), res->length()))) ||
 	ha_checktype(db_type) != db_type) 
     {
       value= res ? res->c_ptr() : "NULL";