bk commit into 6.0 tree (cbell:1.2554)

[cbell]

Below is the list of changes that have just been committed into a local
6.0 repository of cbell.  When cbell 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 16:45:42-05:00, cbell@mysql_cab_desk. +3 -0
  Pushbuild fixes for mysql-6.0-backup tree.
  
  Correct errors found in pushbuild.

  sql/mysqld.cc@stripped, 2008-02-13 16:45:34-05:00, cbell@mysql_cab_desk. +1 -1
    Pushbuild fixes for mysql-6.0-backup tree.
    
    Correct error found in com_status_vars.

  sql/si_objects.cc@stripped, 2008-02-13 16:45:34-05:00, cbell@mysql_cab_desk. +6 -6
    Pushbuild fixes for mysql-6.0-backup tree.
    
    Correct compilation errors on Solaris.

  sql/sql_insert.cc@stripped, 2008-02-13 16:45:35-05:00, cbell@mysql_cab_desk. +2 -1
    Pushbuild fixes for mysql-6.0-backup tree.
    
    Correct merge error both machine and human.

diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2008-02-11 19:17:49 -05:00
+++ b/sql/mysqld.cc	2008-02-13 16:45:34 -05:00
@@ -2953,13 +2953,13 @@ SHOW_VAR com_status_vars[]= {
   {"reset",                (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_RESET]), SHOW_LONG_STATUS},
   {"restore",              (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_RESTORE]), SHOW_LONG_STATUS},
   {"revoke",               (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_REVOKE]), SHOW_LONG_STATUS},
-  {"restore",              (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_RESTORE]), SHOW_LONG_STATUS},
   {"revoke_all",           (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_REVOKE_ALL]), SHOW_LONG_STATUS},
   {"rollback",             (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_ROLLBACK]), SHOW_LONG_STATUS},
   {"rollback_to_savepoint",(char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_ROLLBACK_TO_SAVEPOINT]), SHOW_LONG_STATUS},
   {"savepoint",            (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SAVEPOINT]), SHOW_LONG_STATUS},
   {"select",               (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SELECT]), SHOW_LONG_STATUS},
   {"set_option",           (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SET_OPTION]), SHOW_LONG_STATUS},
+  {"show_archive",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_ARCHIVE]), SHOW_LONG_STATUS},
   {"show_authors",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_AUTHORS]), SHOW_LONG_STATUS},
   {"show_binlog_events",   (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_BINLOG_EVENTS]), SHOW_LONG_STATUS},
   {"show_binlogs",         (char*) offsetof(STATUS_VAR, com_stat[(uint) SQLCOM_SHOW_BINLOGS]), SHOW_LONG_STATUS},
diff -Nrup a/sql/si_objects.cc b/sql/si_objects.cc
--- a/sql/si_objects.cc	2008-02-13 12:36:40 -05:00
+++ b/sql/si_objects.cc	2008-02-13 16:45:34 -05:00
@@ -1374,27 +1374,27 @@ Iterator *create_is_iterator(THD *thd,
 
 template
 DbTablesIterator *
-create_is_iterator(THD *, enum_schema_tables, const String *);
+create_is_iterator<DbTablesIterator>(THD *, enum_schema_tables, const String *);
 
 template
 DbViewsIterator *
-create_is_iterator(THD *, enum_schema_tables, const String *);
+create_is_iterator<DbViewsIterator>(THD *, enum_schema_tables, const String *);
 
 template
 DbTriggerIterator *
-create_is_iterator(THD *, enum_schema_tables, const String *);
+create_is_iterator<DbTriggerIterator>(THD *, enum_schema_tables, const String *);
 
 template
 DbStoredProcIterator *
-create_is_iterator(THD *, enum_schema_tables, const String *);
+create_is_iterator<DbStoredProcIterator>(THD *, enum_schema_tables, const String *);
 
 template
 DbStoredFuncIterator *
-create_is_iterator(THD *, enum_schema_tables, const String *);
+create_is_iterator<DbStoredFuncIterator>(THD *, enum_schema_tables, const String *);
 
 template
 DbEventIterator *
-create_is_iterator(THD *, enum_schema_tables, const String *);
+create_is_iterator<DbEventIterator>(THD *, enum_schema_tables, const String *);
 
 ObjIterator *get_db_tables(THD *thd, const String *db_name)
 {
diff -Nrup a/sql/sql_insert.cc b/sql/sql_insert.cc
--- a/sql/sql_insert.cc	2008-02-11 19:17:50 -05:00
+++ b/sql/sql_insert.cc	2008-02-13 16:45:35 -05:00
@@ -575,7 +575,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *t
   bool log_on= ((thd->options & OPTION_BIN_LOG) ||
                 (!(thd->security_ctx->master_access & SUPER_ACL)));
 #endif
-  thr_lock_type lock_type= TL_IGNORE;
+  thr_lock_type lock_type;
   Item *unused_conds= 0;
   DBUG_ENTER("mysql_insert");
 
@@ -610,6 +610,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *t
     if (open_and_lock_tables(thd, table_list))
       DBUG_RETURN(TRUE);
   }
+  lock_type= table_list->lock_type;
 
   /*
     Breakpoints for backup testing.