bk commit into maria tree (serg:1.2593)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
maria repository of serg.  When serg does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-13 19:41:33+01:00, serg@stripped +1 -0
  compiler warning fixed

  storage/maria/ha_maria.cc@stripped, 2008-02-13 19:41:30+01:00, serg@stripped +9 -13
    compiler warning fixed

diff -Nrup a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc
--- a/storage/maria/ha_maria.cc	2008-02-08 18:14:35 +01:00
+++ b/storage/maria/ha_maria.cc	2008-02-13 19:41:30 +01:00
@@ -1475,12 +1475,8 @@ int ha_maria::assign_to_keycache(THD * t
 
 int ha_maria::preload_keys(THD * thd, HA_CHECK_OPT *check_opt)
 {
-  int error;
-  const char *errmsg;
   ulonglong map;
   TABLE_LIST *table_list= table->pos_in_table_list;
-  my_bool ignore_leaves= table_list->ignore_leaves;
-  char buf[ERRMSGSIZE+20];
 
   DBUG_ENTER("ha_maria::preload_keys");
 
@@ -1499,8 +1495,13 @@ int ha_maria::preload_keys(THD * thd, HA
               (void*) &thd->variables.preload_buff_size);
 
 #ifdef NOT_YET
-  if ((error= maria_preload(file, map, ignore_leaves)))
+  int error;
+
+  if ((error= maria_preload(file, map, table_list->ignore_leaves)))
   {
+    char buf[ERRMSGSIZE+20];
+    const char *errmsg;
+
     switch (error) {
     case HA_ERR_NON_UNIQUE_BLOCK_SIZE:
       errmsg= "Indexes use different block sizes";
@@ -1513,14 +1514,7 @@ int ha_maria::preload_keys(THD * thd, HA
                   "Failed to read from index file (errno: %d)", my_errno);
       errmsg= buf;
     }
-    error= HA_ADMIN_FAILED;
-    goto err;
-  }
-#endif
-  DBUG_RETURN(HA_ADMIN_OK);
 
-err:
-  {
     HA_CHECK param;
     maria_chk_init(&param);
     param.thd= thd;
@@ -1529,8 +1523,10 @@ err:
     param.table_name= table->s->table_name.str;
     param.testflag= 0;
     _ma_check_print_error(&param, errmsg);
-    DBUG_RETURN(error);
+    DBUG_RETURN(HA_ADMIN_FAILED);
   }
+#endif
+  DBUG_RETURN(HA_ADMIN_OK);
 }