Commit 1a53ee1a authored by unknown's avatar unknown
Browse files

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

into  devsrv-b.mysql.com:/space/magnus/my50-bug15302


client/mysqltest.c:
  Auto merged
sql/sql_db.cc:
  Auto merged
parents 5dda41a7 b498114f

sql/sql_db.cc

+9 −3
Original line number Diff line number Diff line
@@ -395,6 +395,12 @@ bool load_db_opt(THD *thd, const char *path, HA_CREATE_INFO *create) 
  silent	Used by replication when internally creating a database.

		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

  FALSE ok

  TRUE  Error
@@ -443,9 +449,9 @@ bool mysql_create_db(THD *thd, char *db, HA_CREATE_INFO *create_info, 
    }

    push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,

			ER_DB_CREATE_EXISTS, ER(ER_DB_CREATE_EXISTS), db);

    error= 0;

    if (!silent)

      send_ok(thd);

    error= 0;

    goto exit;

  }

  else