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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
99f92a5c
Commit
99f92a5c
authored
20 years ago
by
bell@sanja.is.com.ua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removing archive of .frm-s added (BUG#4821)
parent
3d6318eb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
168 additions
and
37 deletions
+168
-37
mysql-test/r/view.result
mysql-test/r/view.result
+6
-0
mysql-test/t/view.test
mysql-test/t/view.test
+10
-0
sql/parse_file.cc
sql/parse_file.cc
+4
-4
sql/sql_db.cc
sql/sql_db.cc
+148
-33
No files found.
mysql-test/r/view.result
View file @
99f92a5c
...
@@ -1097,3 +1097,9 @@ show create view `v 1`;
...
@@ -1097,3 +1097,9 @@ show create view `v 1`;
Table Create Table
Table Create Table
v 1 CREATE VIEW `test`.`v 1` AS select 5 AS `5`
v 1 CREATE VIEW `test`.`v 1` AS select 5 AS `5`
drop view `v 1`;
drop view `v 1`;
create database mysqltest;
create table mysqltest.t1 (a int, b int);
create view mysqltest.v1 as select a from mysqltest.t1;
alter view mysqltest.v1 as select b from mysqltest.t1;
alter view mysqltest.v1 as select a from mysqltest.t1;
drop database mysqltest;
This diff is collapsed.
Click to expand it.
mysql-test/t/view.test
View file @
99f92a5c
...
@@ -1045,3 +1045,13 @@ drop table t1, t2;
...
@@ -1045,3 +1045,13 @@ drop table t1, t2;
CREATE
VIEW
`v 1`
AS
select
5
AS
`5`
;
CREATE
VIEW
`v 1`
AS
select
5
AS
`5`
;
show
create
view
`v 1`
;
show
create
view
`v 1`
;
drop
view
`v 1`
;
drop
view
`v 1`
;
#
# Removing database with .frm archives
#
create
database
mysqltest
;
create
table
mysqltest
.
t1
(
a
int
,
b
int
);
create
view
mysqltest
.
v1
as
select
a
from
mysqltest
.
t1
;
alter
view
mysqltest
.
v1
as
select
b
from
mysqltest
.
t1
;
alter
view
mysqltest
.
v1
as
select
a
from
mysqltest
.
t1
;
drop
database
mysqltest
;
This diff is collapsed.
Click to expand it.
sql/parse_file.cc
View file @
99f92a5c
...
@@ -269,8 +269,8 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
...
@@ -269,8 +269,8 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
}
}
}
}
my_snprintf
(
path_to
,
FN_REFLEN
,
"%s/%s-%04l
ld
"
,
my_snprintf
(
path_to
,
FN_REFLEN
,
"%s/%s-%04l
u
"
,
path_arc
,
file_name
->
str
,
old_version
);
path_arc
,
file_name
->
str
,
(
ulong
)
old_version
);
if
(
my_rename
(
path
,
path_to
,
MYF
(
MY_WME
)))
if
(
my_rename
(
path
,
path_to
,
MYF
(
MY_WME
)))
{
{
DBUG_RETURN
(
TRUE
);
DBUG_RETURN
(
TRUE
);
...
@@ -279,9 +279,9 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
...
@@ -279,9 +279,9 @@ sql_create_definition_file(const LEX_STRING *dir, const LEX_STRING *file_name,
// remove very old version
// remove very old version
if
(
old_version
>
max_versions
)
if
(
old_version
>
max_versions
)
{
{
my_snprintf
(
path_to
,
FN_REFLEN
,
"%s/%s-%04l
ld
"
,
my_snprintf
(
path_to
,
FN_REFLEN
,
"%s/%s-%04l
u
"
,
path_arc
,
file_name
->
str
,
path_arc
,
file_name
->
str
,
old_version
-
max_versions
);
(
ulong
)(
old_version
-
max_versions
)
);
if
(
!
access
(
path_arc
,
F_OK
)
&&
my_delete
(
path_to
,
MYF
(
MY_WME
)))
if
(
!
access
(
path_arc
,
F_OK
)
&&
my_delete
(
path_to
,
MYF
(
MY_WME
)))
{
{
DBUG_RETURN
(
TRUE
);
DBUG_RETURN
(
TRUE
);
...
...
This diff is collapsed.
Click to expand it.
sql/sql_db.cc
View file @
99f92a5c
...
@@ -39,7 +39,8 @@ static TYPELIB known_extentions=
...
@@ -39,7 +39,8 @@ static TYPELIB known_extentions=
static
long
mysql_rm_known_files
(
THD
*
thd
,
MY_DIR
*
dirp
,
static
long
mysql_rm_known_files
(
THD
*
thd
,
MY_DIR
*
dirp
,
const
char
*
db
,
const
char
*
path
,
const
char
*
db
,
const
char
*
path
,
uint
level
);
uint
level
);
static
long
mysql_rm_arc_files
(
THD
*
thd
,
MY_DIR
*
dirp
,
const
char
*
org_path
);
static
my_bool
rm_dir_w_symlink
(
const
char
*
org_path
,
my_bool
send_error
);
/* Database options hash */
/* Database options hash */
static
HASH
dboptions
;
static
HASH
dboptions
;
static
my_bool
dboptions_init
=
0
;
static
my_bool
dboptions_init
=
0
;
...
@@ -544,7 +545,6 @@ int mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
...
@@ -544,7 +545,6 @@ int mysql_alter_db(THD *thd, const char *db, HA_CREATE_INFO *create_info)
-1 Error generated
-1 Error generated
*/
*/
int
mysql_rm_db
(
THD
*
thd
,
char
*
db
,
bool
if_exists
,
bool
silent
)
int
mysql_rm_db
(
THD
*
thd
,
char
*
db
,
bool
if_exists
,
bool
silent
)
{
{
long
deleted
=
0
;
long
deleted
=
0
;
...
@@ -698,9 +698,9 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
...
@@ -698,9 +698,9 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
continue
;
continue
;
/* Check if file is a raid directory */
/* Check if file is a raid directory */
if
((
my_isdigit
(
&
my_charset_latin1
,
file
->
name
[
0
])
||
if
((
my_isdigit
(
system_charset_info
,
file
->
name
[
0
])
||
(
file
->
name
[
0
]
>=
'a'
&&
file
->
name
[
0
]
<=
'f'
))
&&
(
file
->
name
[
0
]
>=
'a'
&&
file
->
name
[
0
]
<=
'f'
))
&&
(
my_isdigit
(
&
my_charset_latin1
,
file
->
name
[
1
])
||
(
my_isdigit
(
system_charset_info
,
file
->
name
[
1
])
||
(
file
->
name
[
1
]
>=
'a'
&&
file
->
name
[
1
]
<=
'f'
))
&&
(
file
->
name
[
1
]
>=
'a'
&&
file
->
name
[
1
]
<=
'f'
))
&&
!
file
->
name
[
2
]
&&
!
level
)
!
file
->
name
[
2
]
&&
!
level
)
{
{
...
@@ -726,6 +726,25 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
...
@@ -726,6 +726,25 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
found_other_files
++
;
found_other_files
++
;
continue
;
continue
;
}
}
else
if
(
file
->
name
[
0
]
==
'a'
&&
file
->
name
[
1
]
==
'r'
&&
file
->
name
[
2
]
==
'c'
&&
file
->
name
[
3
]
==
'\0'
)
{
/* .frm archive */
char
newpath
[
FN_REFLEN
],
*
copy_of_path
;
MY_DIR
*
new_dirp
;
uint
length
;
strxmov
(
newpath
,
org_path
,
"/"
,
"arc"
,
NullS
);
length
=
unpack_filename
(
newpath
,
newpath
);
if
((
new_dirp
=
my_dir
(
newpath
,
MYF
(
MY_DONT_SORT
))))
{
DBUG_PRINT
(
"my"
,(
"Archive subdir found: %s"
,
newpath
));
if
((
mysql_rm_arc_files
(
thd
,
new_dirp
,
newpath
))
<
0
)
goto
err
;
continue
;
}
found_other_files
++
;
continue
;
}
extension
=
fn_ext
(
file
->
name
);
extension
=
fn_ext
(
file
->
name
);
if
(
find_type
(
extension
,
&
deletable_extentions
,
1
+
2
)
<=
0
)
if
(
find_type
(
extension
,
&
deletable_extentions
,
1
+
2
)
<=
0
)
{
{
...
@@ -785,44 +804,140 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
...
@@ -785,44 +804,140 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
}
}
else
else
{
{
char
tmp_path
[
FN_REFLEN
],
*
pos
;
/* Don't give errors if we can't delete 'RAID' directory */
char
*
path
=
tmp_path
;
if
(
rm_dir_w_symlink
(
org_path
,
level
==
0
))
unpack_filename
(
tmp_path
,
org_path
);
DBUG_RETURN
(
-
1
);
}
DBUG_RETURN
(
deleted
);
err:
my_dirend
(
dirp
);
DBUG_RETURN
(
-
1
);
}
/*
Remove directory with symlink
SYNOPSIS
rm_dir_w_symlink()
org_path path of derictory
send_error send errors
RETURN
0 OK
1 ERROR
*/
static
my_bool
rm_dir_w_symlink
(
const
char
*
org_path
,
my_bool
send_error
)
{
char
tmp_path
[
FN_REFLEN
],
tmp2_path
[
FN_REFLEN
],
*
pos
;
char
*
path
=
tmp_path
;
DBUG_ENTER
(
"rm_dir_w_symlink"
);
unpack_filename
(
tmp_path
,
org_path
);
#ifdef HAVE_READLINK
#ifdef HAVE_READLINK
int
error
;
int
error
;
/* Remove end FN_LIBCHAR as this causes problem on Linux in readlink */
pos
=
strend
(
path
);
if
(
pos
>
path
&&
pos
[
-
1
]
==
FN_LIBCHAR
)
*--
pos
=
0
;
if
((
error
=
my_readlink
(
filePath
,
path
,
MYF
(
MY_WME
)))
<
0
)
/* Remove end FN_LIBCHAR as this causes problem on Linux in readlink */
DBUG_RETURN
(
-
1
);
pos
=
strend
(
path
);
if
(
!
error
)
if
(
pos
>
path
&&
pos
[
-
1
]
==
FN_LIBCHAR
)
*--
pos
=
0
;
if
((
error
=
my_readlink
(
tmp2_path
,
path
,
MYF
(
MY_WME
)))
<
0
)
DBUG_RETURN
(
1
);
if
(
!
error
)
{
if
(
my_delete
(
path
,
MYF
(
send_error
?
MY_WME
:
0
)))
{
{
if
(
my_delete
(
path
,
MYF
(
!
level
?
MY_WME
:
0
)))
DBUG_RETURN
(
send_error
);
{
/* Don't give errors if we can't delete 'RAID' directory */
if
(
level
)
DBUG_RETURN
(
deleted
);
DBUG_RETURN
(
-
1
);
}
/* Delete directory symbolic link pointed at */
path
=
filePath
;
}
}
/* Delete directory symbolic link pointed at */
path
=
tmp2_path
;
}
#endif
#endif
/* Remove last FN_LIBCHAR to not cause a problem on OS/2 */
/* Remove last FN_LIBCHAR to not cause a problem on OS/2 */
pos
=
strend
(
path
);
pos
=
strend
(
path
);
if
(
pos
>
path
&&
pos
[
-
1
]
==
FN_LIBCHAR
)
if
(
pos
>
path
&&
pos
[
-
1
]
==
FN_LIBCHAR
)
*--
pos
=
0
;
*--
pos
=
0
;
/* Don't give errors if we can't delete 'RAID' directory */
if
(
rmdir
(
path
)
<
0
&&
send_error
)
if
(
rmdir
(
path
)
<
0
&&
!
level
)
{
my_error
(
ER_DB_DROP_RMDIR
,
MYF
(
0
),
path
,
errno
);
DBUG_RETURN
(
-
1
);
}
DBUG_RETURN
(
0
);
}
/*
Remove .frm archives from directory
SYNOPSIS
thd thread handler
dirp list of files in archive directory
db data base name
org_path path of archive directory
RETURN
> 0 number of removed files
-1 error
*/
static
long
mysql_rm_arc_files
(
THD
*
thd
,
MY_DIR
*
dirp
,
const
char
*
org_path
)
{
long
deleted
=
0
;
ulong
found_other_files
=
0
;
char
filePath
[
FN_REFLEN
];
DBUG_ENTER
(
"mysql_rm_arc_files"
);
DBUG_PRINT
(
"enter"
,
(
"path: %s"
,
org_path
));
for
(
uint
idx
=
0
;
idx
<
(
uint
)
dirp
->
number_off_files
&&
!
thd
->
killed
;
idx
++
)
{
FILEINFO
*
file
=
dirp
->
dir_entry
+
idx
;
char
*
extension
,
*
revision
;
DBUG_PRINT
(
"info"
,(
"Examining: %s"
,
file
->
name
));
/* skiping . and .. */
if
(
file
->
name
[
0
]
==
'.'
&&
(
!
file
->
name
[
1
]
||
(
file
->
name
[
1
]
==
'.'
&&
!
file
->
name
[
2
])))
continue
;
extension
=
fn_ext
(
file
->
name
);
if
(
extension
[
0
]
!=
'.'
||
extension
[
1
]
!=
'f'
||
extension
[
2
]
!=
'r'
||
extension
[
3
]
!=
'm'
||
extension
[
4
]
!=
'-'
)
{
{
my_error
(
ER_DB_DROP_RMDIR
,
MYF
(
0
),
path
,
errno
);
found_other_files
++
;
DBUG_RETURN
(
-
1
);
continue
;
}
revision
=
extension
+
5
;
while
(
*
revision
&&
my_isdigit
(
system_charset_info
,
*
revision
))
revision
++
;
if
(
*
revision
)
{
found_other_files
++
;
continue
;
}
strxmov
(
filePath
,
org_path
,
"/"
,
file
->
name
,
NullS
);
if
(
my_delete_with_symlink
(
filePath
,
MYF
(
MY_WME
)))
{
goto
err
;
}
}
}
}
if
(
thd
->
killed
)
goto
err
;
my_dirend
(
dirp
);
/*
If the directory is a symbolic link, remove the link first, then
remove the directory the symbolic link pointed at
*/
if
(
!
found_other_files
&&
rm_dir_w_symlink
(
org_path
,
0
))
DBUG_RETURN
(
-
1
);
DBUG_RETURN
(
deleted
);
DBUG_RETURN
(
deleted
);
err:
err:
...
...
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