database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
into  naruto.:C:/cpp/mysql-4.1-maint
This commit is contained in:
unknown
2006-12-14 16:02:43 +01:00
parent ddb182e53d e78b4fc276
commit e21242fef8
3 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/r/windows.result
View File

@ -6,3 +6,9 @@ use prn;
ERROR 42000: Unknown database 'prn' ERROR 42000: Unknown database 'prn'
create table nu (a int); create table nu (a int);
drop table nu; 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;

9
mysql-test/t/windows.test
View File

@ -17,4 +17,13 @@ use prn;
create table nu (a int); create table nu (a int);
drop table nu; 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 # End of 4.1 tests

6
sql/sql_parse.cc
View File

@ -2485,6 +2485,12 @@ mysql_execute_command(THD *thd)
goto unsent_create_error; goto unsent_create_error;
#ifndef HAVE_READLINK #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; lex->create_info.data_file_name=lex->create_info.index_file_name=0;
#else #else
/* Fix names if symlinked tables */ /* Fix names if symlinked tables */