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
7ec2d474
Commit
7ec2d474
authored
23 years ago
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Plain Diff
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
parents
bd109ae9
0a51e72a
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
154 additions
and
49 deletions
+154
-49
Docs/manual.texi
Docs/manual.texi
+3
-1
include/my_sys.h
include/my_sys.h
+2
-0
libmysql/Makefile.shared
libmysql/Makefile.shared
+1
-1
mysys/Makefile.am
mysys/Makefile.am
+1
-1
mysys/mf_same.c
mysys/mf_same.c
+9
-6
mysys/my_symlink.c
mysys/my_symlink.c
+7
-40
mysys/my_symlink2.c
mysys/my_symlink2.c
+131
-0
No files found.
Docs/manual.texi
View file @
7ec2d474
...
...
@@ -44847,7 +44847,9 @@ table for a different site you are working on, but the table is just a
bit different (that is - fields in different order, etc.).
By Steve Shreeve.
@item @uref{http://www.mysql.com/Downloads/Contrib/oracledump, oracledump}
Perl program to convert Oracle databases to @strong{MySQL}. By Johan Andersson.
Perl program to convert Oracle databases to @strong{MySQL}. Has same
output format as mysqldump. By Johan Andersson.
@item @uref{http://www.mysql.com/Downloads/Contrib/excel2mysql, excel2mysql}
Perl program to import Excel spreadsheets into a @strong{MySQL} database. By Stephen Hurd @email{shurd@@sk.sympatico.ca}
This diff is collapsed.
Click to expand it.
include/my_sys.h
View file @
7ec2d474
...
...
@@ -385,6 +385,8 @@ extern int my_realpath(char *to, const char *filename, myf MyFlags);
extern
File
my_create_with_symlink
(
const
char
*
linkname
,
const
char
*
filename
,
int
createflags
,
int
access_flags
,
myf
MyFlags
);
extern
int
my_delete_with_symlink
(
const
char
*
name
,
myf
MyFlags
);
extern
int
my_rename_with_symlink
(
const
char
*
from
,
const
char
*
to
,
myf
MyFlags
);
extern
int
my_symlink
(
const
char
*
content
,
const
char
*
linkname
,
myf
MyFlags
);
extern
uint
my_read
(
File
Filedes
,
byte
*
Buffer
,
uint
Count
,
myf
MyFlags
);
extern
uint
my_pread
(
File
Filedes
,
byte
*
Buffer
,
uint
Count
,
my_off_t
offset
,
...
...
This diff is collapsed.
Click to expand it.
libmysql/Makefile.shared
View file @
7ec2d474
...
...
@@ -51,7 +51,7 @@ mysysobjects1 = my_init.lo my_static.lo my_malloc.lo my_realloc.lo \
mf_pack.lo my_messnc.lo mf_dirname.lo mf_fn_ext.lo
\
mf_wcomp.lo typelib.lo safemalloc.lo my_alloc.lo
\
mf_format.lo mf_path.lo mf_unixpath.lo my_fopen.lo
\
my_fstream.lo
\
my_
symlink.lo my_
fstream.lo
\
mf_loadpath.lo my_pthread.lo my_thr_init.lo
\
thr_mutex.lo mulalloc.lo string.lo default.lo
\
my_compress.lo array.lo my_once.lo list.lo my_net.lo
\
...
...
This diff is collapsed.
Click to expand it.
mysys/Makefile.am
View file @
7ec2d474
...
...
@@ -33,7 +33,7 @@ libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c\
my_alloc.c safemalloc.c my_fopen.c my_fstream.c
\
my_error.c errors.c my_div.c my_messnc.c
\
mf_format.c mf_same.c mf_dirname.c mf_fn_ext.c
\
my_symlink.c
\
my_symlink.c
my_symlink2.c
\
mf_pack.c mf_pack2.c mf_unixpath.c mf_stripp.c
\
mf_casecnv.c mf_soundex.c mf_wcomp.c mf_wfile.c
\
mf_qsort.c mf_qsort2.c mf_sort.c
\
...
...
This diff is collapsed.
Click to expand it.
mysys/mf_same.c
View file @
7ec2d474
...
...
@@ -20,19 +20,22 @@
#include "mysys_priv.h"
#include <m_string.h>
/* Formaterar ett filnamn i avsende p} ett annat namn */
/* Klarar {ven to = name */
/* Denna funktion r|r inte p} utg}ngsnamnet */
/*
Copy directory and/or extension between filenames.
(For the meaning of 'flag', check mf_format.c)
'to' may be equal to 'name'.
Returns 'to'.
*/
my_string
fn_same
(
my_string
toname
,
const
char
*
name
,
int
flag
)
my_string
fn_same
(
char
*
to
,
const
char
*
name
,
int
flag
)
{
char
dev
[
FN_REFLEN
];
const
char
*
ext
;
DBUG_ENTER
(
"fn_same"
);
DBUG_PRINT
(
"
mfunkt"
,(
"to: %s name: %s flag: %d"
,
toname
,
name
,
flag
));
DBUG_PRINT
(
"
enter"
,(
"to: %s name: %s flag: %d"
,
to
,
name
,
flag
));
if
((
ext
=
strrchr
(
name
+
dirname_part
(
dev
,
name
),
FN_EXTCHAR
))
==
0
)
ext
=
""
;
DBUG_RETURN
(
fn_format
(
to
name
,
toname
,
dev
,
ext
,
flag
));
DBUG_RETURN
(
fn_format
(
to
,
to
,
dev
,
ext
,
flag
));
}
/* fn_same */
This diff is collapsed.
Click to expand it.
mysys/my_symlink.c
View file @
7ec2d474
...
...
@@ -18,6 +18,7 @@
#include "mysys_priv.h"
#include "mysys_err.h"
#include <m_string.h>
#include <errno.h>
#ifdef HAVE_REALPATH
#include <sys/param.h>
#include <sys/stat.h>
...
...
@@ -26,13 +27,16 @@
/*
Reads the content of a symbolic link
If the file is not a symbolic link, return the original file name in to.
Returns: 0 if table was a symlink,
1 if table was a normal file
-1 on error.
*/
int
my_readlink
(
char
*
to
,
const
char
*
filename
,
myf
MyFlags
)
{
#ifndef HAVE_READLINK
strmov
(
to
,
filename
);
return
0
;
return
1
;
#else
int
result
=
0
;
int
length
;
...
...
@@ -43,6 +47,7 @@ int my_readlink(char *to, const char *filename, myf MyFlags)
/* Don't give an error if this wasn't a symlink */
if
((
my_errno
=
errno
)
==
EINVAL
)
{
result
=
1
;
strmov
(
to
,
filename
);
}
else
...
...
@@ -81,44 +86,6 @@ int my_symlink(const char *content, const char *linkname, myf MyFlags)
#endif
/* HAVE_READLINK */
}
/*
Create a file and a symbolic link that points to this file
If linkname is a null pointer or equal to filename, we don't
create a link.
*/
File
my_create_with_symlink
(
const
char
*
linkname
,
const
char
*
filename
,
int
createflags
,
int
access_flags
,
myf
MyFlags
)
{
File
file
;
int
tmp_errno
;
DBUG_ENTER
(
"my_create_with_symlink"
);
if
((
file
=
my_create
(
filename
,
createflags
,
access_flags
,
MyFlags
))
>=
0
)
{
/* Test if we should create a link */
if
(
linkname
&&
strcmp
(
linkname
,
filename
))
{
/* Delete old link/file */
if
(
MyFlags
&
MY_DELETE_OLD
)
my_delete
(
linkname
,
MYF
(
0
));
/* Create link */
if
(
my_symlink
(
filename
,
linkname
,
MyFlags
))
{
/* Fail, remove everything we have done */
tmp_errno
=
my_errno
;
my_close
(
file
,
MYF
(
0
));
my_delete
(
filename
,
MYF
(
0
));
file
=
-
1
;
my_errno
=
tmp_errno
;
}
}
}
DBUG_RETURN
(
file
);
}
/*
Resolve all symbolic links in path
'to' may be equal to 'filename'
...
...
@@ -162,7 +129,7 @@ int my_realpath(char *to, const char *filename, myf MyFlags)
result
=
-
1
;
}
}
return
result
;
DBUG_RETURN
(
result
)
;
#else
if
(
to
!=
filename
)
strmov
(
to
,
filename
);
...
...
This diff is collapsed.
Click to expand it.
mysys/my_symlink2.c
0 → 100644
View file @
7ec2d474
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA */
/*
Advanced symlink handling.
This is used in MyISAM to let users symlinks tables to different disk.
The main idea with these functions is to automaticly create, delete and
rename files and symlinks like they would be one unit.
*/
#include "mysys_priv.h"
#include <m_string.h>
File
my_create_with_symlink
(
const
char
*
linkname
,
const
char
*
filename
,
int
createflags
,
int
access_flags
,
myf
MyFlags
)
{
File
file
;
int
tmp_errno
;
DBUG_ENTER
(
"my_create_with_symlink"
);
if
((
file
=
my_create
(
filename
,
createflags
,
access_flags
,
MyFlags
))
>=
0
)
{
/* Test if we should create a link */
if
(
linkname
&&
strcmp
(
linkname
,
filename
))
{
/* Delete old link/file */
if
(
MyFlags
&
MY_DELETE_OLD
)
my_delete
(
linkname
,
MYF
(
0
));
/* Create link */
if
(
my_symlink
(
filename
,
linkname
,
MyFlags
))
{
/* Fail, remove everything we have done */
tmp_errno
=
my_errno
;
my_close
(
file
,
MYF
(
0
));
my_delete
(
filename
,
MYF
(
0
));
file
=
-
1
;
my_errno
=
tmp_errno
;
}
}
}
DBUG_RETURN
(
file
);
}
/*
If the file was a symlink, delete both symlink and the file which the
symlink pointed to.
*/
int
my_delete_with_symlink
(
const
char
*
name
,
myf
MyFlags
)
{
char
link_name
[
FN_REFLEN
];
int
was_symlink
=
!
my_readlink
(
link_name
,
name
,
MYF
(
0
));
int
result
;
DBUG_ENTER
(
"my_delete_with_symlink"
);
if
(
!
(
result
=
my_delete
(
name
,
MyFlags
)))
{
if
(
was_symlink
)
result
=
my_delete
(
link_name
,
MyFlags
);
}
DBUG_RETURN
(
result
);
}
/*
If the file is a normal file, just rename it.
If the file is a symlink:
- Create a new file with the name 'to' that points at
symlink_dir/basename(to)
- Rename the symlinked file to symlink_dir/basename(to)
- Delete 'from'
If something goes wrong, restore everything.
*/
int
my_rename_with_symlink
(
const
char
*
from
,
const
char
*
to
,
myf
MyFlags
)
{
#ifdef HAVE_READLINK
return
my_rename
(
from
,
to
,
MyFlags
);
#else
char
link_name
[
FN_REFLEN
],
tmp_name
[
FN_REFLEN
];
int
was_symlink
=
!
my_readlink
(
link_name
,
name
,
MYF
(
0
));
int
result
;
DBUG_ENTER
(
"my_rename_with_symlink"
);
if
(
!
was_symlink
)
DBUG_RETURN
(
my_rename
(
from
,
to
,
MyFlags
));
/* Change filename that symlink pointed to */
strmov
(
tmp_name
,
to
);
fn_same
(
tmp_name
,
link_name
,
1
);
/* Copy dir */
/* Create new symlink */
if
(
my_symlink
(
tmp_name
,
to
,
MyFlags
))
DBUG_RETURN
(
-
1
);
/*
Rename symlinked file if the base name didn't change.
This can happen if you use this function where 'from' and 'to' has
the same basename and different directories.
*/
if
(
strcmp
(
link_name
,
tmp_name
)
&&
my_rename
(
link_name
,
tmp_name
,
MyFlags
))
{
my_delete
(
to
,
MyFlags
);
/* Remove created symlink */
DBUG_RETURN
(
-
1
);
}
/* Remove original symlink */
if
(
my_delete
(
from
,
MyFlags
))
{
/* Remove created link */
my_delete
(
to
,
MyFlags
);
/* Rename file back */
if
(
strcmp
(
link_name
,
tmp_name
))
(
void
)
my_rename
(
tmp_name
,
link_name
,
MyFlags
);
}
DBUG_RETURN
(
result
);
#endif
/* HAVE_READLINK */
}
This diff is collapsed.
Click to expand it.
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