bk commit into 6.0 tree (tsmith:1.2606)

[tim]

Below is the list of changes that have just been committed into a local
6.0 repository of tsmith.  When tsmith 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-03-27 02:45:34+01:00, tsmith@stripped +10 -0
  Force conflict; changes will be removed during null merge of 5.1-ss2360

  mysql-test/r/innodb.result@stripped, 2008-03-27 02:45:02+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  mysql-test/t/innodb.test@stripped, 2008-03-27 02:45:02+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/dict/dict0dict.c@stripped, 2008-03-27 02:45:00+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/handler/ha_innodb.cc@stripped, 2008-03-27 02:45:03+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/handler/ha_innodb.h@stripped, 2008-03-27 02:45:03+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/include/dict0dict.h@stripped, 2008-03-27 02:45:00+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/include/dict0mem.h@stripped, 2008-03-27 02:45:01+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/include/row0sel.h@stripped, 2008-03-27 02:45:01+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/include/univ.i@stripped, 2008-03-27 02:45:01+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

  storage/innobase/row/row0sel.c@stripped, 2008-03-27 02:45:02+01:00, tsmith@stripped +1 -0
    force conflict; changes will be removed during null merge of 5.1-ss2360

diff -Nrup a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
--- a/mysql-test/r/innodb.result	2008-03-12 11:54:16 +01:00
+++ b/mysql-test/r/innodb.result	2008-03-27 02:45:02 +01:00
@@ -3219,3 +3219,4 @@ a
 2
 DROP TABLE t1;
 DROP TABLE t2;
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/mysql-test/t/innodb.test b/mysql-test/t/innodb.test
--- a/mysql-test/t/innodb.test	2008-02-19 23:57:52 +01:00
+++ b/mysql-test/t/innodb.test	2008-03-27 02:45:02 +01:00
@@ -2394,3 +2394,4 @@ DISCONNECT c2;
 # (otherwise your changes may be erased).                             #
 #                                                                     #
 #######################################################################
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c
--- a/storage/innobase/dict/dict0dict.c	2007-11-20 20:02:16 +01:00
+++ b/storage/innobase/dict/dict0dict.c	2008-03-27 02:45:00 +01:00
@@ -4213,3 +4213,4 @@ dict_index_name_print(
 	fputs(" of table ", file);
 	ut_print_name(file, trx, TRUE, index->table_name);
 }
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
--- a/storage/innobase/handler/ha_innodb.cc	2008-03-12 09:25:26 +01:00
+++ b/storage/innobase/handler/ha_innodb.cc	2008-03-27 02:45:03 +01:00
@@ -8284,3 +8284,4 @@ int ha_innobase::read_range_next()
   return res;
 }
 
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
--- a/storage/innobase/handler/ha_innodb.h	2008-01-10 23:04:53 +01:00
+++ b/storage/innobase/handler/ha_innodb.h	2008-03-27 02:45:03 +01:00
@@ -286,3 +286,4 @@ int thd_binlog_format(const MYSQL_THD th
 */
 void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all);
 }
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h
--- a/storage/innobase/include/dict0dict.h	2007-08-25 03:14:48 +02:00
+++ b/storage/innobase/include/dict0dict.h	2008-03-27 02:45:00 +01:00
@@ -1001,3 +1001,4 @@ struct dict_sys_struct{
 #endif
 
 #endif
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/include/dict0mem.h b/storage/innobase/include/dict0mem.h
--- a/storage/innobase/include/dict0mem.h	2007-08-25 11:55:35 +02:00
+++ b/storage/innobase/include/dict0mem.h	2008-03-27 02:45:01 +01:00
@@ -437,3 +437,4 @@ struct dict_table_struct{
 #endif
 
 #endif
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/include/row0sel.h b/storage/innobase/include/row0sel.h
--- a/storage/innobase/include/row0sel.h	2007-08-25 03:14:48 +02:00
+++ b/storage/innobase/include/row0sel.h	2008-03-27 02:45:01 +01:00
@@ -390,3 +390,4 @@ struct row_printf_node_struct{
 #endif
 
 #endif
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i
--- a/storage/innobase/include/univ.i	2007-11-07 00:33:49 +01:00
+++ b/storage/innobase/include/univ.i	2008-03-27 02:45:01 +01:00
@@ -344,3 +344,4 @@ typedef void* os_thread_ret_t;
 } while (0)
 
 #endif
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360
diff -Nrup a/storage/innobase/row/row0sel.c b/storage/innobase/row/row0sel.c
--- a/storage/innobase/row/row0sel.c	2008-01-24 01:46:08 +01:00
+++ b/storage/innobase/row/row0sel.c	2008-03-27 02:45:02 +01:00
@@ -4742,3 +4742,4 @@ row_search_max_autoinc(
 
 	return(error);
 }
+FORCE CONFLICT; WILL BE REMOVED DURING NULL MERGE OF 5.1-ss2360