bk commit into 5.1 tree (msvensson:1.2391)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-11-29 18:35:33+01:00, msvensson@shellback.(none) +3 -0
  Merge fixes for new test cases

  mysql-test/r/mysql_upgrade.result@stripped, 2006-11-29 18:35:28+01:00, msvensson@shellback.(none) +2 -2
    Merge fixes for new test cases

  mysql-test/t/system_mysql_db_fix40123.test@stripped, 2006-11-29 18:35:28+01:00, msvensson@shellback.(none) +1 -1
    Merge fixes for new test cases

  mysql-test/t/system_mysql_db_fix50030.test@stripped, 2006-11-29 18:35:28+01:00, msvensson@shellback.(none) +1 -1
    Merge fixes for new test cases

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-maint

--- 1.2/mysql-test/r/mysql_upgrade.result	2006-11-29 18:35:46 +01:00
+++ 1.3/mysql-test/r/mysql_upgrade.result	2006-11-29 18:35:46 +01:00
@@ -1,5 +1,5 @@
 Run mysql_upgrade once
-cluster.binlog_index                               OK
+mysql.binlog_index                                 OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK
@@ -107,7 +107,7 @@
 1
 1
 Force should run it regardless of wheter it's been run before
-cluster.binlog_index                               OK
+mysql.binlog_index                                 OK
 mysql.columns_priv                                 OK
 mysql.db                                           OK
 mysql.event                                        OK

--- 1.2/mysql-test/t/system_mysql_db_fix40123.test	2006-11-29 18:35:46 +01:00
+++ 1.3/mysql-test/t/system_mysql_db_fix40123.test	2006-11-29 18:35:46 +01:00
@@ -69,7 +69,7 @@
 -- disable_query_log
 
 # Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, binlog_index;
 
 -- enable_query_log
 

--- 1.1/mysql-test/t/system_mysql_db_fix50030.test	2006-11-29 18:35:46 +01:00
+++ 1.2/mysql-test/t/system_mysql_db_fix50030.test	2006-11-29 18:35:46 +01:00
@@ -72,7 +72,7 @@
 -- disable_query_log
 
 # Drop all tables created by this test
-DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event;
+DROP TABLE db, host, user, func, plugin, tables_priv, columns_priv, procs_priv, help_category, help_keyword, help_relation, help_topic, proc, time_zone, time_zone_leap_second, time_zone_name, time_zone_transition, time_zone_transition_type, general_log, slow_log, event, binlog_index;
 
 -- enable_query_log