database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge msvensson@msvensson.mysql.internal:/home/msvensson/mysql/bug15302/my50-bug15302

Browse Source 
into  devsrv-b.mysql.com:/space/magnus/my50-bug15302
This commit is contained in:
msvensson@devsrv-b.mysql.com
2006-01-31 15:14:46 +01:00
parent e2360cf745 ba81b1dd52
commit b844f62614
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_db.cc
View File

@ -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,
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