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
4fc2b926
Commit
4fc2b926
authored
Feb 07, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge neptunus.(none):/home/msvensson/mysql/bug15302/my51-bug15302
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new
parents
bcefb0c7
c7c88438
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
sql/sql_db.cc
sql/sql_db.cc
+9
-3
No files found.
sql/sql_db.cc
View file @
4fc2b926
...
@@ -395,6 +395,12 @@ err1:
...
@@ -395,6 +395,12 @@ err1:
silent Used by replication when internally creating a database.
silent Used by replication when internally creating a database.
In this case the entry should not be logged.
In this case the entry should not be logged.
SIDE-EFFECTS
1. Report back to client that command succeeded (send_ok)
2. Report errors to client
3. Log event to binary log
(The 'silent' flags turns off 1 and 3.)
RETURN VALUES
RETURN VALUES
FALSE ok
FALSE ok
TRUE Error
TRUE Error
...
@@ -435,17 +441,17 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
...
@@ -435,17 +441,17 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info,
if
(
my_stat
(
path
,
&
stat_info
,
MYF
(
0
)))
if
(
my_stat
(
path
,
&
stat_info
,
MYF
(
0
)))
{
{
if
(
!
(
create_options
&
HA_LEX_CREATE_IF_NOT_EXISTS
))
if
(
!
(
create_options
&
HA_LEX_CREATE_IF_NOT_EXISTS
))
{
{
my_error
(
ER_DB_CREATE_EXISTS
,
MYF
(
0
),
db
);
my_error
(
ER_DB_CREATE_EXISTS
,
MYF
(
0
),
db
);
error
=
-
1
;
error
=
-
1
;
goto
exit
;
goto
exit
;
}
}
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
push_warning_printf
(
thd
,
MYSQL_ERROR
::
WARN_LEVEL_NOTE
,
ER_DB_CREATE_EXISTS
,
ER
(
ER_DB_CREATE_EXISTS
),
db
);
ER_DB_CREATE_EXISTS
,
ER
(
ER_DB_CREATE_EXISTS
),
db
);
error
=
0
;
if
(
!
silent
)
if
(
!
silent
)
send_ok
(
thd
);
send_ok
(
thd
);
error
=
0
;
goto
exit
;
goto
exit
;
}
}
else
else
...
...
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