bzr commit into mysql-6.0 branch (kgeorge:2783)

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/bzr/test-6.0-bugteam/

 2783 Georgi Kodinov	2008-08-19
      removed merge conflict files from the 6.0-main->6.0-bugteam merge
removed:
  mysql-test/r/innodb_bug35220.result.moved
  mysql-test/t/innodb_bug35220.test.moved

=== removed file 'mysql-test/r/innodb_bug35220.result.moved'
--- a/mysql-test/r/innodb_bug35220.result.moved	2008-08-19 14:14:18 +0000
+++ b/mysql-test/r/innodb_bug35220.result.moved	1970-01-01 00:00:00 +0000
@@ -1 +0,0 @@
-SET storage_engine=InnoDB;

=== removed file 'mysql-test/t/innodb_bug35220.test.moved'
--- a/mysql-test/t/innodb_bug35220.test.moved	2008-08-19 14:14:18 +0000
+++ b/mysql-test/t/innodb_bug35220.test.moved	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;