bk commit into 4.1 tree (svoj:1.2516) BUG#1662

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 repository of svoj. When svoj 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
  1.2516 06/06/27 15:30:27 svoj@stripped +3 -0
  BUG#1662 - ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY
  Produce a warning if DATA/INDEX DIRECTORY is specified in
  ALTER TABLE statement.
  
  Ignoring of these options is documented in the symbolic links
  section of the manual.

  sql/sql_parse.cc
    1.482 06/06/27 15:30:22 svoj@stripped +6 -0
    Produce a warning if DATA/INDEX DIRECTORY is specified in
    ALTER TABLE statement.

  mysql-test/t/alter_table.test
    1.40 06/06/27 15:30:22 svoj@stripped +7 -0
    Test case for BUG#1662.

  mysql-test/r/alter_table.result
    1.50 06/06/27 15:30:22 svoj@stripped +6 -0
    Test case for BUG#1662.

# 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:	svoj
# Host:	may.pils.ru
# Root:	/home/svoj/devel/mysql/BUG1662/mysql-4.1

--- 1.481/sql/sql_parse.cc	2006-05-29 01:31:11 +05:00
+++ 1.482/sql/sql_parse.cc	2006-06-27 15:30:22 +05:00
@@ -2673,6 +2673,12 @@ unsent_create_error:
 	}
       }
       /* Don't yet allow changing of symlinks with ALTER TABLE */
+      if (lex->create_info.data_file_name)
+        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+                     "DATA DIRECTORY option ignored");
+      if (lex->create_info.index_file_name)
+        push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN, 0,
+                     "INDEX DIRECTORY option ignored");
       lex->create_info.data_file_name=lex->create_info.index_file_name=0;
       /* ALTER TABLE ends previous transaction */
       if (end_active_trans(thd))

--- 1.49/mysql-test/r/alter_table.result	2005-08-29 19:54:29 +05:00
+++ 1.50/mysql-test/r/alter_table.result	2006-06-27 15:30:22 +05:00
@@ -543,3 +543,9 @@ ERROR 3D000: No database selected
 alter table test.t1 rename test.t1;
 use test;
 drop table t1;
+CREATE TABLE t1(a INT);
+ALTER TABLE t1 DATA DIRECTORY='' INDEX DIRECTORY='';
+Warnings:
+Warning	0	DATA DIRECTORY option ignored
+Warning	0	INDEX DIRECTORY option ignored
+DROP TABLE t1;

--- 1.39/mysql-test/t/alter_table.test	2005-08-29 19:54:29 +05:00
+++ 1.40/mysql-test/t/alter_table.test	2006-06-27 15:30:22 +05:00
@@ -392,4 +392,11 @@ alter table test.t1 rename test.t1;
 use test;
 drop table t1;
 
+#
+# BUG#1662 - ALTER TABLE LIKE ignores DATA/INDEX DIRECTPORY
+#
+CREATE TABLE t1(a INT);
+ALTER TABLE t1 DATA DIRECTORY='' INDEX DIRECTORY='';
+DROP TABLE t1;
+
 # End of 4.1 tests