Merge mysql.com:/home/kostja/mysql/tmp_merge

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/information_schema_db.result:
  Auto merged
sql/ha_archive.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/table.h:
  Auto merged
mysql-test/r/information_schema.result:
  SCCS merged

4 files changed, 14 insertions, 16 deletions

diff --git a/sql/ha_archive.cc b/sql/ha_archive.cc
index 2a2ac475c0b..366ae08462b 100644
--- a/sql/ha_archive.cc
+++ b/sql/ha_archive.cc
@@ -520,7 +520,7 @@ const char **ha_archive::bas_ext() const
   Init out lock.
   We open the file we will read from.
 */
-int ha_archive::open(const char *name, int mode, uint test_if_locked)
+int ha_archive::open(const char *name, int mode, uint open_options)
 {
   DBUG_ENTER("ha_archive::open");
 
@@ -535,7 +535,10 @@ int ha_archive::open(const char *name, int mode, uint test_if_locked)
     DBUG_RETURN(HA_ERR_CRASHED_ON_USAGE);
   }
 
-  DBUG_RETURN(0);
+  if (open_options & HA_OPEN_FOR_REPAIR)
+    DBUG_RETURN(0);
+
+  DBUG_RETURN(share->crashed ? HA_ERR_CRASHED_ON_USAGE : 0);
 }
 
 
@@ -1340,7 +1343,8 @@ int ha_archive::delete_all_rows()
 */
 bool ha_archive::is_crashed() const 
 {
-  return share->crashed; 
+  DBUG_ENTER("ha_archive::is_crashed");
+  DBUG_RETURN(share->crashed); 
 }
 
 /*
@@ -1402,12 +1406,5 @@ bool ha_archive::check_and_repair(THD *thd)
 
   check_opt.init();
 
-  if (check(thd, &check_opt) == HA_ADMIN_CORRUPT)
-  {
-    DBUG_RETURN(repair(thd, &check_opt));
-  }
-  else
-  {
-    DBUG_RETURN(HA_ADMIN_OK);
-  }
+  DBUG_RETURN(repair(thd, &check_opt));
 }
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 47aa53d25e2..be6bfa2f5ed 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2214,7 +2214,8 @@ make_join_statistics(JOIN *join, TABLE_LIST *tables, COND *conds,
 	  if (eq_part.is_prefix(table->key_info[key].key_parts) &&
 	      ((table->key_info[key].flags & (HA_NOSAME | HA_END_SPACE_KEY)) ==
 	       HA_NOSAME) &&
-              !table->fulltext_searched)
+              !table->fulltext_searched && 
+              !table->pos_in_table_list->embedding)
 	  {
 	    if (const_ref == eq_part)
 	    {					// Found everything for ref.
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index d30ce8d6b59..2289ad219a2 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -5073,12 +5073,12 @@ ST_SCHEMA_TABLE schema_tables[]=
     fill_schema_table_privileges, 0, 0, -1, -1, 0},
   {"TRIGGERS", triggers_fields_info, create_schema_table,
    get_all_tables, make_old_format, get_schema_triggers_record, 5, 6, 0},
+  {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 
+    fill_schema_user_privileges, 0, 0, -1, -1, 0},
   {"VARIABLES", variables_fields_info, create_schema_table, fill_variables,
    make_old_format, 0, -1, -1, 1},
   {"VIEWS", view_fields_info, create_schema_table, 
     get_all_tables, 0, get_schema_views_record, 1, 2, 0},
-  {"USER_PRIVILEGES", user_privileges_fields_info, create_schema_table, 
-    fill_schema_user_privileges, 0, 0, -1, -1, 0},
   {0, 0, 0, 0, 0, 0, 0, 0, 0}
 };
 
diff --git a/sql/table.h b/sql/table.h
index a799d4389fb..3a017983ff9 100644
--- a/sql/table.h
+++ b/sql/table.h
@@ -354,9 +354,9 @@ enum enum_schema_tables
   SCH_TABLE_NAMES,
   SCH_TABLE_PRIVILEGES,
   SCH_TRIGGERS,
+  SCH_USER_PRIVILEGES,
   SCH_VARIABLES,
-  SCH_VIEWS,
-  SCH_USER_PRIVILEGES
+  SCH_VIEWS
 };