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
d20ccef6
Commit
d20ccef6
authored
Mar 01, 2006
by
aivanov@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/alexi/bugs/mysql-5.0-merged
parents
70b344f9
a3ea8947
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
6 deletions
+12
-6
sql/sql_db.cc
sql/sql_db.cc
+12
-6
No files found.
sql/sql_db.cc
View file @
d20ccef6
...
@@ -1098,7 +1098,8 @@ static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp,
...
@@ -1098,7 +1098,8 @@ static long mysql_rm_arc_files(THD *thd, MY_DIR *dirp,
bool
mysql_change_db
(
THD
*
thd
,
const
char
*
name
,
bool
no_access_check
)
bool
mysql_change_db
(
THD
*
thd
,
const
char
*
name
,
bool
no_access_check
)
{
{
int
length
,
db_length
;
int
length
,
db_length
;
char
*
dbname
=
my_strdup
((
char
*
)
name
,
MYF
(
MY_WME
));
char
*
dbname
=
thd
->
slave_thread
?
(
char
*
)
name
:
my_strdup
((
char
*
)
name
,
MYF
(
MY_WME
));
char
path
[
FN_REFLEN
];
char
path
[
FN_REFLEN
];
HA_CREATE_INFO
create
;
HA_CREATE_INFO
create
;
bool
system_db
=
0
;
bool
system_db
=
0
;
...
@@ -1121,6 +1122,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
...
@@ -1121,6 +1122,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
system_db
=
1
;
system_db
=
1
;
goto
end
;
goto
end
;
}
}
if
(
!
(
thd
->
slave_thread
))
x_free
(
dbname
);
/* purecov: inspected */
x_free
(
dbname
);
/* purecov: inspected */
my_message
(
ER_NO_DB_ERROR
,
ER
(
ER_NO_DB_ERROR
),
my_message
(
ER_NO_DB_ERROR
,
ER
(
ER_NO_DB_ERROR
),
MYF
(
0
));
/* purecov: inspected */
MYF
(
0
));
/* purecov: inspected */
...
@@ -1129,6 +1131,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
...
@@ -1129,6 +1131,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
if
(
check_db_name
(
dbname
))
if
(
check_db_name
(
dbname
))
{
{
my_error
(
ER_WRONG_DB_NAME
,
MYF
(
0
),
dbname
);
my_error
(
ER_WRONG_DB_NAME
,
MYF
(
0
),
dbname
);
if
(
!
(
thd
->
slave_thread
))
my_free
(
dbname
,
MYF
(
0
));
my_free
(
dbname
,
MYF
(
0
));
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
}
}
...
@@ -1159,6 +1162,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
...
@@ -1159,6 +1162,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
dbname
);
dbname
);
mysql_log
.
write
(
thd
,
COM_INIT_DB
,
ER
(
ER_DBACCESS_DENIED_ERROR
),
mysql_log
.
write
(
thd
,
COM_INIT_DB
,
ER
(
ER_DBACCESS_DENIED_ERROR
),
sctx
->
priv_user
,
sctx
->
priv_host
,
dbname
);
sctx
->
priv_user
,
sctx
->
priv_host
,
dbname
);
if
(
!
(
thd
->
slave_thread
))
my_free
(
dbname
,
MYF
(
0
));
my_free
(
dbname
,
MYF
(
0
));
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
}
}
...
@@ -1171,6 +1175,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
...
@@ -1171,6 +1175,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
if
(
my_access
(
path
,
F_OK
))
if
(
my_access
(
path
,
F_OK
))
{
{
my_error
(
ER_BAD_DB_ERROR
,
MYF
(
0
),
dbname
);
my_error
(
ER_BAD_DB_ERROR
,
MYF
(
0
),
dbname
);
if
(
!
(
thd
->
slave_thread
))
my_free
(
dbname
,
MYF
(
0
));
my_free
(
dbname
,
MYF
(
0
));
DBUG_RETURN
(
1
);
DBUG_RETURN
(
1
);
}
}
...
@@ -1179,6 +1184,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
...
@@ -1179,6 +1184,7 @@ bool mysql_change_db(THD *thd, const char *name, bool no_access_check)
x_free
(
thd
->
db
);
x_free
(
thd
->
db
);
if
(
dbname
&&
dbname
[
0
]
==
0
)
if
(
dbname
&&
dbname
[
0
]
==
0
)
{
{
if
(
!
(
thd
->
slave_thread
))
my_free
(
dbname
,
MYF
(
0
));
my_free
(
dbname
,
MYF
(
0
));
thd
->
db
=
NULL
;
thd
->
db
=
NULL
;
thd
->
db_length
=
0
;
thd
->
db_length
=
0
;
...
...
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