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
1616c68b
Commit
1616c68b
authored
Feb 29, 2008
by
gluh@eagle.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/gluh/MySQL/Merge/4.1-opt
into mysql.com:/home/gluh/MySQL/Merge/5.0-opt
parents
931bdedb
4d582db8
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
mysql-test/r/symlink.result
mysql-test/r/symlink.result
+4
-4
mysql-test/t/symlink.test
mysql-test/t/symlink.test
+3
-0
No files found.
mysql-test/r/symlink.result
View file @
1616c68b
...
@@ -149,14 +149,14 @@ CREATE TABLE t1(a INT)
...
@@ -149,14 +149,14 @@ CREATE TABLE t1(a INT)
DATA DIRECTORY='TEST_DIR/var/master-data/test';
DATA DIRECTORY='TEST_DIR/var/master-data/test';
ERROR HY000: Incorrect arguments to DATA DIRECORY
ERROR HY000: Incorrect arguments to DATA DIRECORY
CREATE TABLE t1(a INT)
CREATE TABLE t1(a INT)
DATA DIRECTORY='
/home/gluh/MySQL/Merge/5.0-opt/mysql-test
/var/master-data/';
DATA DIRECTORY='
TEST_DIR
/var/master-data/';
ERROR HY000: Incorrect arguments to DATA DIRECORY
ERROR HY000: Incorrect arguments to DATA DIRECORY
CREATE TABLE t1(a INT)
CREATE TABLE t1(a INT)
INDEX DIRECTORY='
/home/gluh/MySQL/Merge/5.0-opt/mysql-test
/var/master-data';
INDEX DIRECTORY='
TEST_DIR
/var/master-data';
ERROR HY000: Incorrect arguments to INDEX DIRECORY
ERROR HY000: Incorrect arguments to INDEX DIRECORY
CREATE TABLE t1(a INT)
CREATE TABLE t1(a INT)
INDEX DIRECTORY='
/home/gluh/MySQL/Merge/5.0-opt/mysql-test
/var/master-data_var';
INDEX DIRECTORY='
TEST_DIR
/var/master-data_var';
ERROR HY000: Can't create/write to file '
/home/gluh/MySQL/Merge/5.0-opt/mysql-test
/var/master-data_var/t1.MYI' (Errcode: 2)
ERROR HY000: Can't create/write to file '
TEST_DIR
/var/master-data_var/t1.MYI' (Errcode: 2)
End of 4.1 tests
End of 4.1 tests
SET SESSION keep_files_on_create = TRUE;
SET SESSION keep_files_on_create = TRUE;
CREATE TABLE t1 (a INT) ENGINE MYISAM;
CREATE TABLE t1 (a INT) ENGINE MYISAM;
...
...
mysql-test/t/symlink.test
View file @
1616c68b
...
@@ -207,12 +207,15 @@ deallocate prepare stmt;
...
@@ -207,12 +207,15 @@ deallocate prepare stmt;
--
error
1210
--
error
1210
eval
CREATE
TABLE
t1
(
a
INT
)
eval
CREATE
TABLE
t1
(
a
INT
)
DATA
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data/test'
;
DATA
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data/test'
;
--
replace_result
$MYSQL_TEST_DIR
TEST_DIR
--
error
1210
--
error
1210
eval
CREATE
TABLE
t1
(
a
INT
)
eval
CREATE
TABLE
t1
(
a
INT
)
DATA
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data/'
;
DATA
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data/'
;
--
replace_result
$MYSQL_TEST_DIR
TEST_DIR
--
error
1210
--
error
1210
eval
CREATE
TABLE
t1
(
a
INT
)
eval
CREATE
TABLE
t1
(
a
INT
)
INDEX
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data'
;
INDEX
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data'
;
--
replace_result
$MYSQL_TEST_DIR
TEST_DIR
--
error
1
--
error
1
eval
CREATE
TABLE
t1
(
a
INT
)
eval
CREATE
TABLE
t1
(
a
INT
)
INDEX
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data_var'
;
INDEX
DIRECTORY
=
'$MYSQL_TEST_DIR/var/master-data_var'
;
...
...
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