Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

2 files changed, 6 insertions, 6 deletions

diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 7250288c924..d30d285d0b8 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -3068,7 +3068,7 @@ struct show_var_st init_vars[]= {
   {"log_update",              (char*) &opt_update_log,              SHOW_BOOL},
   {"log_bin",                 (char*) &opt_bin_log,                 SHOW_BOOL},
   {"log_slave_updates",       (char*) &opt_log_slave_updates,       SHOW_BOOL},
-  {"log_long_queries",        (char*) &opt_slow_log,                SHOW_BOOL},
+  {"log_slow_queries",        (char*) &opt_slow_log,                SHOW_BOOL},
   {"long_query_time",         (char*) &long_query_time,             SHOW_LONG},
   {"low_priority_updates",    (char*) &low_priority_updates,        SHOW_BOOL},
   {"lower_case_table_names",  (char*) &lower_case_table_names,      SHOW_LONG},
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index a5116fa0e20..f4a70db2e5d 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -708,11 +708,11 @@ TABLE *reopen_name_locked_table(THD* thd, TABLE_LIST* table_list)
   if (open_unireg_entry(thd, table, db, table_name, table_name, 1) ||
       !(table->table_cache_key =memdup_root(&table->mem_root,(char*) key,
 					    key_length)))
-    {
-      closefrm(table);
-      pthread_mutex_unlock(&LOCK_open);
-      DBUG_RETURN(0);
-    }
+  {
+    closefrm(table);
+    pthread_mutex_unlock(&LOCK_open);
+    DBUG_RETURN(0);
+  }
 
   table->key_length=key_length;
   table->version=0;