diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-02-07 09:03:49 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-02-07 09:03:49 +0100 |
| commit | 91dda86a74e5e4f4d474c84b037209315230a0b3 (patch) | |
| tree | 9b10c7c316761bc03dd4917a4240c86d4da76434 /tests/travis/prepare_mysql.sh | |
| parent | 4171854e2fdcf30592025cc67815e032ea97fc06 (diff) | |
| parent | 24a650d7ecc07e46a7d7cfb1ef3cd60cc7da791b (diff) | |
| download | volse-hubzilla-91dda86a74e5e4f4d474c84b037209315230a0b3.tar.gz volse-hubzilla-91dda86a74e5e4f4d474c84b037209315230a0b3.tar.bz2 volse-hubzilla-91dda86a74e5e4f4d474c84b037209315230a0b3.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'tests/travis/prepare_mysql.sh')
| -rwxr-xr-x | tests/travis/prepare_mysql.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/travis/prepare_mysql.sh b/tests/travis/prepare_mysql.sh index 095ad7e25..5b1c96d78 100755 --- a/tests/travis/prepare_mysql.sh +++ b/tests/travis/prepare_mysql.sh @@ -25,7 +25,7 @@ # Exit if anything fails set -e -echo "Preparing for MySQL ..." +echo "Preparing for MySQL/MariaDB ..." if [[ "$MYSQL_VERSION" == "5.7" ]]; then echo "Using MySQL 5.7 in Docker container, need to use TCP" @@ -41,13 +41,13 @@ mysql $PROTO -e "SHOW VARIABLES LIKE 'character_set%';" mysql $PROTO -e "SELECT @@sql_mode;" # Create Hubzilla database -mysql $PROTO -u root -e "CREATE DATABASE IF NOT EXISTS hubzilla;"; -mysql $PROTO -u root -e "CREATE USER 'hubzilla'@'localhost' IDENTIFIED BY 'hubzilla';" -mysql $PROTO -u root -e "GRANT ALL ON hubzilla.* TO 'hubzilla'@'localhost';" +mysql $PROTO -u root -e "CREATE DATABASE IF NOT EXISTS travis_hubzilla;"; +mysql $PROTO -u root -e "CREATE USER 'travis_hz'@'%' IDENTIFIED BY 'hubzilla';" +mysql $PROTO -u root -e "GRANT ALL ON travis_hubzilla.* TO 'travis_hz'@'%';" # Import table structure -mysql $PROTO -u root hubzilla < ./install/schema_mysql.sql +mysql $PROTO -u root travis_hubzilla < ./install/schema_mysql.sql # Show databases and tables mysql $PROTO -u root -e "SHOW DATABASES;" -mysql $PROTO -u root -e "USE hubzilla; SHOW TABLES;" +mysql $PROTO -u root -e "USE travis_hubzilla; SHOW TABLES;" |