From: Kern Sibbald <kern@sibbald.com>
Date: Sat, 27 May 2017 06:02:07 +0000 (+0200)
Subject: Do not produce error if MySQL database exists in create_mysql_database
X-Git-Tag: Release-7.9.1~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9c99c9da3e8f633fca40e2812d917ebc29795620;p=bacula%2Fbacula

Do not produce error if MySQL database exists in create_mysql_database
---

diff --git a/bacula/src/cats/create_mysql_database.in b/bacula/src/cats/create_mysql_database.in
index 123aa0bb40..63199f8099 100644
--- a/bacula/src/cats/create_mysql_database.in
+++ b/bacula/src/cats/create_mysql_database.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2000-2015 Kern Sibbald
+# Copyright (C) 2000-2017 Kern Sibbald
 # License: BSD 2-Clause; see file LICENSE-FOSS
 #
 # shell script to create Bacula database(s)
@@ -10,7 +10,7 @@ bindir=@MYSQL_BINDIR@
 db_name=@db_name@
 
 if $bindir/mysql $* -f <<END-OF-DATA
-CREATE DATABASE ${db_name};
+CREATE DATABASE IF NOT EXISTS ${db_name};
 END-OF-DATA
 then
    echo "Creation of ${db_name} database succeeded."