bzr push into mysql-6.0 branch (sven:2769 to 2770)

[Sven Sandberg]

 2770 Sven Sandberg	2008-08-18 [merge]
      merge 6.0-rpl-testfixes -> 6.0
      The following conflicts were resolved manually:
      Path conflict: <deleted> / mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
      Conflict adding file mysql-test/t/innodb_bug35220.test.  Moved existing file to mysql-test/t/innodb_bug35220.test.moved.
removed:
  mysql-test/t/innodb_bug35220.test
added:
  mysql-test/t/innodb_bug35220.test

 2769 Sven Sandberg	2008-08-18 [merge]
      Merge 5.1 main -> 6.0 main.
      The following conflicts were resolved manually:
      Conflict adding file mysql-test/r/innodb_bug35220.result.  Moved existing file to mysql-test/r/innodb_bug35220.result.moved.
      Text conflict in mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
      Text conflict in mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
      Text conflict in mysql-test/suite/rpl/t/rpl_loaddata_map.test
      Path conflict: mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt / mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
      Conflict adding file mysql-test/t/innodb_bug35220.test.  Moved existing file to mysql-test/t/innodb_bug35220.test.moved.
      Text conflict in tests/mysql_client_test.c
removed:
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-master.opt
  mysql-test/suite/rpl/t/rpl_row_err_daisychain-slave.opt
  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2-master.opt
  mysql-test/t/innodb_bug35220.test
added:
  mysql-test/t/innodb_bug35220.test
modified:
  mysql-test/extra/binlog_tests/binlog_insert_delayed.test
  mysql-test/extra/rpl_tests/rpl_row_basic.test
  mysql-test/include/show_binlog_events.inc
  mysql-test/suite/binlog/r/binlog_killed_simulate.result
  mysql-test/suite/binlog/r/binlog_row_binlog.result
  mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
  mysql-test/suite/binlog/r/binlog_statement_insert_delayed.result
  mysql-test/suite/binlog/r/binlog_stm_binlog.result
  mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
  mysql-test/suite/rpl/r/rpl_loaddata_map.result
  mysql-test/suite/rpl/r/rpl_row_basic_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_basic_3innodb.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/r/rpl_variables.result
  mysql-test/suite/rpl/t/disabled.def
  mysql-test/suite/rpl/t/rpl_incident.test
  mysql-test/suite/rpl/t/rpl_loaddata_map.test
  mysql-test/suite/rpl/t/rpl_trunc_temp.test
  mysql-test/suite/rpl/t/rpl_variables.test
  mysql-test/suite/rpl_ndb/t/rpl_truncate_7ndb_2.test
  mysql-test/suite/rpl_ndb_big/r/rpl_row_basic_7ndb.result
  sql/sql_binlog.cc
  sql/sql_cursor.cc
  tests/mysql_client_test.c

=== added file 'mysql-test/t/innodb_bug35220.test'
--- a/mysql-test/t/innodb_bug35220.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/t/innodb_bug35220.test	2008-06-12 00:08:07 +0000
@@ -0,0 +1,16 @@
+#
+# Bug#35220 ALTER TABLE too picky on reserved word "foreign"
+# http://bugs.mysql.com/35220
+#
+
+-- source include/have_innodb.inc
+
+SET storage_engine=InnoDB;
+
+# we care only that the following SQL commands do not produce errors
+-- disable_query_log
+-- disable_result_log
+
+CREATE TABLE bug35220 (foreign_col INT, dummy_cant_delete_all_columns INT);
+ALTER TABLE bug35220 DROP foreign_col;
+DROP TABLE bug35220;

=== removed file 'mysql-test/t/innodb_bug35220.test'
--- a/mysql-test/t/innodb_bug35220.test	2008-08-08 00:25:24 +0000
+++ b/mysql-test/t/innodb_bug35220.test	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#
-# Bug#35220 ALTER TABLE too picky on reserved word "foreign"
-# http://bugs.mysql.com/35220
-#
-
--- source include/have_innodb.inc
-
-SET storage_engine=InnoDB;
-
-# we care only that the following SQL commands do not produce errors
--- disable_query_log
--- disable_result_log
-
-CREATE TABLE bug35220 (foreign_col INT, dummy_cant_delete_all_columns INT);
-ALTER TABLE bug35220 DROP foreign_col;
-DROP TABLE bug35220;