Commit e21242fe authored by unknown's avatar unknown
Browse files

Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint 

into  naruto.:C:/cpp/mysql-4.1-maint
parents ddb182e5 e78b4fc2

mysql-test/r/windows.result

+6 −0
Original line number Diff line number Diff line
@@ -6,3 +6,9 @@ use prn; 
ERROR 42000: Unknown database 'prn'

create table nu (a int);

drop table nu;

drop table if exists t1;

CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM;

Warnings:

Warning	0	DATA DIRECTORY option ignored

Warning	0	INDEX DIRECTORY option ignored

drop table t1;

mysql-test/t/windows.test

+9 −0
Original line number Diff line number Diff line
@@ -17,4 +17,13 @@ use prn; 
create table nu (a int);

drop table nu;



#

# Bug17489: ailed to put data file in custom directory use "data directory" option

#

--disable_warnings

drop table if exists t1;

--enable_warnings

CREATE TABLE t1 ( `ID` int(6) ) data directory 'c:/tmp/' index directory 'c:/tmp/' engine=MyISAM;

drop table t1;



# End of 4.1 tests

sql/sql_parse.cc

+6 −0
Original line number Diff line number Diff line
@@ -2485,6 +2485,12 @@ mysql_execute_command(THD *thd) 
      goto unsent_create_error;



#ifndef HAVE_READLINK

    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;

#else

    /* Fix names if symlinked tables */