database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

Merge mysql.com:/home/jimw/my/mysql-4.1-8707

Browse Source 
into mysql.com:/home/jimw/my/mysql-4.1-clean
This commit is contained in:
unknown
2005-03-03 10:50:18 -08:00
parent 45058c6896 a1db28a290
commit aa52954f6f
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/r/symlink.result
View File

@@ -84,3 +84,17 @@ t1 CREATE TABLE `t1` (
`b` int(11) default NULL `b` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
create table t1 (i int) data directory = "/home/jimw/my/mysql-4.1-8707/mysql-test/var/master-data/test/";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;
create table t1 (i int) index directory = "/home/jimw/my/mysql-4.1-8707/mysql-test/var/master-data/test/";
show create table t1;
Table Create Table
t1 CREATE TABLE `t1` (
`i` int(11) default NULL
) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1;

11
mysql-test/t/symlink.test
View File

@@ -115,3 +115,14 @@ eval alter table t1 index directory="$MYSQL_TEST_DIR/var/log";
enable_query_log; enable_query_log;
show create table t1; show create table t1;
drop table t1; drop table t1;
#
# Test specifying DATA DIRECTORY that is the same as what would normally
# have been chosen. (Bug #8707)
#
eval create table t1 (i int) data directory = "$MYSQL_TEST_DIR/var/master-data/test/";
show create table t1;
drop table t1;
eval create table t1 (i int) index directory = "$MYSQL_TEST_DIR/var/master-data/test/";
show create table t1;
drop table t1;

7
mysys/my_symlink2.c
View File

@@ -32,6 +32,7 @@ File my_create_with_symlink(const char *linkname, const char *filename,
int tmp_errno; int tmp_errno;
/* Test if we should create a link */ /* Test if we should create a link */
int create_link; int create_link;
char abs_linkname[FN_REFLEN];
DBUG_ENTER("my_create_with_symlink"); DBUG_ENTER("my_create_with_symlink");
if (my_disable_symlinks) if (my_disable_symlinks)
@@ -42,7 +43,11 @@ File my_create_with_symlink(const char *linkname, const char *filename,
filename= linkname; filename= linkname;
} }
else else
create_link= (linkname && strcmp(linkname,filename)); {
if (linkname)
my_realpath(&abs_linkname, linkname, MYF(0));
create_link= (linkname && strcmp(abs_linkname,filename));
}
if (!(MyFlags & MY_DELETE_OLD)) if (!(MyFlags & MY_DELETE_OLD))
{ {