diff --git a/sql/sql_handler.cc b/sql/sql_handler.cc
index 12e8c9e227a..a98b6c13a00 100644
--- a/sql/sql_handler.cc
+++ b/sql/sql_handler.cc
@@ -153,10 +153,13 @@ int mysql_ha_read(THD *thd, TABLE_LIST *tables,
   {
     switch(mode) {
     case RFIRST:
-      err=keyname ?
-	table->file->index_first(table->record[0]) :
-	table->file->rnd_init(1) ||
-	table->file->rnd_next(table->record[0]);
+      if (keyname)
+        err=table->file->index_first(table->record[0]);
+      else
+      {
+	if (!(err=table->file->rnd_init(1)))
+          err=table->file->rnd_next(table->record[0]);
+      }
       mode=RNEXT;
       break;
     case RLAST:
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 31fcb0be8e3..4c92c35632a 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -1374,6 +1374,7 @@ int mysql_alter_table(THD *thd,char *new_db, char *new_name,
     new_db=db;
   used_fields=create_info->used_fields;
 
+  mysql_ha_closeall(thd, table_list);
   if (!(table=open_ltable(thd,table_list,TL_WRITE_ALLOW_READ)))
     DBUG_RETURN(-1);