Commit ffd8ed17 authored by svoj@may.pils.ru's avatar svoj@may.pils.ru
Browse files

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.
parent 49cc2904

mysql-test/r/symlink.result

+6 −0
Original line number Diff line number Diff line
@@ -65,18 +65,24 @@ t9 CREATE TABLE `t9` ( 
) ENGINE=MyISAM AUTO_INCREMENT=16725 DEFAULT CHARSET=latin1 DATA DIRECTORY='TEST_DIR/var/tmp/' INDEX DIRECTORY='TEST_DIR/var/run/'

drop database mysqltest;

create table t1 (a int not null) engine=myisam;

Warnings:

Warning	0	DATA DIRECTORY option ignored

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) NOT NULL default '0'

) ENGINE=MyISAM DEFAULT CHARSET=latin1

alter table t1 add b int;

Warnings:

Warning	0	DATA DIRECTORY option ignored

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

  `a` int(11) NOT NULL default '0',

  `b` int(11) default NULL

) ENGINE=MyISAM DEFAULT CHARSET=latin1

Warnings:

Warning	0	INDEX DIRECTORY option ignored

show create table t1;

Table	Create Table

t1	CREATE TABLE `t1` (

sql/sql_parse.cc

+6 −0
Original line number Diff line number Diff line
@@ -2678,6 +2678,12 @@ mysql_execute_command(THD *thd) 
	}

      }

      /* 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))