aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authoryangyan <yangyanyj@chinamobile.com>2019-04-03 10:55:35 +0800
committerYan Yang <yangyanyj@chinamobile.com>2019-04-03 03:52:42 +0000
commit6e702cc6d82cfcaf79735ec2840cf294458bbb92 (patch)
tree0fd04ed455838b931911cde35b84882d72974e84 /resources
parentbeedfac1cf7e7c0ad5d127dcdd32b779a214c950 (diff)
fix database bug
Change-Id: Id4c1149ee3d1d348abe02cd92324499e4158201b Issue-ID: VFC-1334 Signed-off-by: yangyan <yangyanyj@chinamobile.com>
Diffstat (limited to 'resources')
-rw-r--r--resources/bin/initDB.sh6
-rw-r--r--resources/dbscripts/mysql/vfc-nfvo-lcm-createdb.sql8
2 files changed, 5 insertions, 9 deletions
diff --git a/resources/bin/initDB.sh b/resources/bin/initDB.sh
index 01bb1561..7c0fa02a 100644
--- a/resources/bin/initDB.sh
+++ b/resources/bin/initDB.sh
@@ -26,10 +26,10 @@ sql_path=$HOME/../
mysql -u$MYSQL_USER -p$MYSQL_PASSWORD -P$MYSQL_PORT -h$MYSQL_IP <$sql_path/dbscripts/mysql/vfc-nfvo-lcm-createdb.sql
sql_result=$?
if [ $sql_result -ne 0 ] ; then
- echo "failed to create vfcnfvolcm database"
+ echo "Failed to create vfcnfvolcm database"
exit 1
-elif [ $sql_result -eq 0 ]; then
- echo "create vfcnfvolcm database successfully"
+else
+ echo "Create vfcnfvolcm database successfully"
exit 0
fi
diff --git a/resources/dbscripts/mysql/vfc-nfvo-lcm-createdb.sql b/resources/dbscripts/mysql/vfc-nfvo-lcm-createdb.sql
index 94e630b5..bd90a1fa 100644
--- a/resources/dbscripts/mysql/vfc-nfvo-lcm-createdb.sql
+++ b/resources/dbscripts/mysql/vfc-nfvo-lcm-createdb.sql
@@ -14,14 +14,10 @@
-- limitations under the License.
--
-/******************drop old database and user***************************/
+/******************create database and user***************************/
use mysql;
-drop database IF EXISTS vfcnfvolcm;
-delete from user where User='vfcnfvolcm';
-FLUSH PRIVILEGES;
+create database if not exists vfcnfvolcm CHARACTER SET utf8;
-/******************create new database and user***************************/
-create database vfcnfvolcm CHARACTER SET utf8;
GRANT ALL PRIVILEGES ON vfcnfvolcm.* TO 'vfcnfvolcm'@'%' IDENTIFIED BY 'vfcnfvolcm' WITH GRANT OPTION;
GRANT ALL PRIVILEGES ON mysql.* TO 'vfcnfvolcm'@'%' IDENTIFIED BY 'vfcnfvolcm' WITH GRANT OPTION;