X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=database_utils%2Finit_mano_db.sh;h=224269bc1c2399b857c481bc97f95806f5ba1730;hb=60f4d2287e906417f151f8b41f07493eb1bf5af4;hp=4b73441d5ef359fe5f56f5e6f0592d9d381fdab4;hpb=89b3d840dfa2ae1aae544338fad79cf7703f4af4;p=osm%2FRO.git diff --git a/database_utils/init_mano_db.sh b/database_utils/init_mano_db.sh index 4b73441d..224269bc 100755 --- a/database_utils/init_mano_db.sh +++ b/database_utils/init_mano_db.sh @@ -91,9 +91,9 @@ done shift $((OPTIND-1)) #check and ask for database user password -#DBUSER_="-u$DBUSER" -#DBPASS_="" -#[ -n "$DBPASS" ] && DBPASS_="-p$DBPASS" +DBUSER_="-u$DBUSER" +DBPASS_="" +[ -n "$DBPASS" ] && DBPASS_="-p$DBPASS" DBHOST_="-h$DBHOST" DBPORT_="-P$DBPORT" @@ -133,7 +133,8 @@ if [ -n "${CREATEDB}" ]; then fi echo " loading ${DIRNAME}/${DBNAME}_structure.sql" -mysql $DEF_EXTRA_FILE_PARAM $DBHOST_ $DBPORT $DBNAME < ${DIRNAME}/mano_db_structure.sql +#echo 'mysql '$DEF_EXTRA_FILE_PARAM' '$DBHOST_' '$DBPORT_' '$DBNAME' < '${DIRNAME}'/mano_db_structure.sql' +mysql $DEF_EXTRA_FILE_PARAM $DBHOST_ $DBPORT_ $DBNAME < ${DIRNAME}/mano_db_structure.sql echo " migrage database version" ${DIRNAME}/migrate_mano_db.sh $DBHOST_ $DBPORT_ $DBUSER_ $DBPASS_ -d$DBNAME