Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
e21242fe
Commit
e21242fe
authored
Dec 14, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge kpettersson@bk-internal:/home/bk/mysql-4.1-maint
into naruto.:C:/cpp/mysql-4.1-maint
parents
ddb182e5
e78b4fc2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
0 deletions
+21
-0
mysql-test/r/windows.result
mysql-test/r/windows.result
+6
-0
mysql-test/t/windows.test
mysql-test/t/windows.test
+9
-0
sql/sql_parse.cc
sql/sql_parse.cc
+6
-0
No files found.
mysql-test/r/windows.result
View file @
e21242fe
...
@@ -6,3 +6,9 @@ use prn;
...
@@ -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;
mysql-test/t/windows.test
View file @
e21242fe
...
@@ -17,4 +17,13 @@ use prn;
...
@@ -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
sql/sql_parse.cc
View file @
e21242fe
...
@@ -2485,6 +2485,12 @@ mysql_execute_command(THD *thd)
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment