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

[Georgi Kodinov]

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

 2782 Georgi Kodinov	2008-08-19 [merge]
      merged 6.0-main to 6.0-bugteam
added:
  mysql-test/r/innodb_bug35220.result
  mysql-test/t/innodb_bug35220.test
renamed:
  mysql-test/r/innodb_bug35220.result => mysql-test/r/innodb_bug35220.result.moved
  mysql-test/t/innodb_bug35220.test => mysql-test/t/innodb_bug35220.test.moved
modified:
  .bzr-mysql/default.conf

=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2008-08-15 19:58:03 +0000
+++ b/.bzr-mysql/default.conf	2008-08-19 14:14:18 +0000
@@ -1,5 +1,5 @@
 [MYSQL]
-tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0-bugteam/
+tree_location = bzr+ssh://bk-internal.mysql.com/bzrroot/server/mysql-6.0
 post_commit_to = commits@stripped
 post_push_to = commits@stripped
 tree_name = mysql-6.0

=== added file 'mysql-test/r/innodb_bug35220.result'
--- a/mysql-test/r/innodb_bug35220.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/r/innodb_bug35220.result	2008-06-12 00:08:07 +0000
@@ -0,0 +1 @@
+SET storage_engine=InnoDB;

=== renamed file 'mysql-test/r/innodb_bug35220.result' => 'mysql-test/r/innodb_bug35220.result.moved'
=== 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;

=== renamed file 'mysql-test/t/innodb_bug35220.test' => 'mysql-test/t/innodb_bug35220.test.moved'