diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-05-19 20:55:37 +0200 |
commit | c07325f932abef2032b2e56532f6cb615e2a1161 (patch) | |
tree | 754ca158e45ebc014e5cbeaf4c3e7581f9575d76 /scripts/mysql_install_db.sh | |
parent | 7f8187bc432f79afe4c0549d68845a68e6c159ab (diff) | |
parent | 2ae83affef5a4d89f38272db31a400f968279a7a (diff) | |
download | mariadb-git-c07325f932abef2032b2e56532f6cb615e2a1161.tar.gz |
Merge branch '10.3' into 10.4
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r-- | scripts/mysql_install_db.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index d87c0aa48a5..1ea1e39be36 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -13,7 +13,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1335 USA # This scripts creates the MariaDB Server system tables # @@ -441,7 +441,7 @@ then fi # Create database directories -for dir in "$ldata" "$ldata/mysql" +for dir in "$ldata" do if test ! -d "$dir" then @@ -522,6 +522,7 @@ auth_root_socket_user=${auth_root_socket_user:-${user:-${USER:-root}}} cat_sql() { + echo "create database if not exists mysql;" echo "use mysql;" case "$auth_root_authentication_method" in |