bk commit into 5.1 tree (konstantin:1.2079)

[Konstantin Osipov]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja. When kostja 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
  1.2079 06/02/07 15:26:58 konstantin@stripped +6 -0
  Merge mysql.com:/home/kostja/mysql/tmp_merge
  into  mysql.com:/home/kostja/mysql/mysql-5.1-merge

  mysql-test/r/information_schema.result
    1.109 06/02/07 15:26:53 konstantin@stripped +0 -0
    SCCS merged

  sql/table.h
    1.129 06/02/07 15:26:16 konstantin@stripped +0 -0
    Auto merged

  sql/sql_show.cc
    1.300 06/02/07 15:26:16 konstantin@stripped +0 -0
    Auto merged

  sql/sql_select.cc
    1.386 06/02/07 15:26:16 konstantin@stripped +0 -0
    Auto merged

  sql/ha_archive.cc
    1.78 06/02/07 15:26:16 konstantin@stripped +0 -0
    Auto merged

  mysql-test/r/information_schema_db.result
    1.12 06/02/07 15:26:15 konstantin@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	konstantin
# Host:	oak.local
# Root:	/home/kostja/mysql/mysql-5.1-merge/RESYNC

--- 1.385/sql/sql_select.cc	2006-02-02 23:20:19 +03:00
+++ 1.386/sql/sql_select.cc	2006-02-07 15:26:16 +03:00
@@ -2214,7 +2214,8 @@
 	  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.

--- 1.299/sql/sql_show.cc	2006-02-02 23:20:19 +03:00
+++ 1.300/sql/sql_show.cc	2006-02-07 15:26:16 +03:00
@@ -5073,12 +5073,12 @@
     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}
 };
 

--- 1.128/sql/table.h	2006-02-02 23:20:21 +03:00
+++ 1.129/sql/table.h	2006-02-07 15:26:16 +03:00
@@ -354,9 +354,9 @@
   SCH_TABLE_NAMES,
   SCH_TABLE_PRIVILEGES,
   SCH_TRIGGERS,
+  SCH_USER_PRIVILEGES,
   SCH_VARIABLES,
-  SCH_VIEWS,
-  SCH_USER_PRIVILEGES
+  SCH_VIEWS
 };
 
 

--- 1.77/sql/ha_archive.cc	2006-02-02 23:22:05 +03:00
+++ 1.78/sql/ha_archive.cc	2006-02-07 15:26:16 +03:00
@@ -520,7 +520,7 @@
   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 @@
     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 @@
 */
 bool ha_archive::is_crashed() const 
 {
-  return share->crashed; 
+  DBUG_ENTER("ha_archive::is_crashed");
+  DBUG_RETURN(share->crashed); 
 }
 
 /*
@@ -1402,12 +1406,5 @@
 
   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));
 }

--- 1.108/mysql-test/r/information_schema.result	2006-02-03 23:21:09 +03:00
+++ 1.109/mysql-test/r/information_schema.result	2006-02-07 15:26:53 +03:00
@@ -57,8 +57,8 @@
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
 TRIGGERS
-VIEWS
 USER_PRIVILEGES
+VIEWS
 binlog_index
 columns_priv
 db

--- 1.11/mysql-test/r/information_schema_db.result	2006-02-01 16:47:03 +03:00
+++ 1.12/mysql-test/r/information_schema_db.result	2006-02-07 15:26:15 +03:00
@@ -20,8 +20,8 @@
 TABLE_CONSTRAINTS
 TABLE_PRIVILEGES
 TRIGGERS
-VIEWS
 USER_PRIVILEGES
+VIEWS
 show tables from INFORMATION_SCHEMA like 'T%';
 Tables_in_information_schema (T%)
 TABLES