Merge branch 'master' of http://git.quantgroup.cn/QA/qa-deploy-utils

db-utils/db_execute_sql.sh

@@ -8,14 +8,15 @@
 
 mysql_host=$1
 db_name=$2
+target_db_port=$3
 sql_file_folder=/home/qa-deploy-utils/db-utils/sql_to_run
 
 echo "cd $sql_file_folder"
 cd $sql_file_folder
 if [ -n "$db_name" ];then
     if [ -f $db_name.sql ];then
-        echo "mysql -h $mysql_host -uqa -pqatest < $db_name.sql"
-        mysql -h $mysql_host -uqa -pqatest < $db_name.sql
+        echo "mysql -h $mysql_host -P $target_db_port -uqa -pqatest < $db_name.sql"
+        mysql -h $mysql_host -P $target_db_port -uqa -pqatest < $db_name.sql
     else
         echo "have no $db_name.sql"
     fi
@@ -23,6 +24,6 @@ else
     for entry in ./*
     do
         echo "run sql file: $entry"
-        mysql -h $mysql_host -uqa -pqatest < $entry
+        mysql -h $mysql_host -P $target_db_port -uqa -pqatest < $entry
     done
 fi

db-utils/db_schema_sync.sh

@@ -103,7 +103,7 @@ function run_sql_file()
 {
 	sync_db_name=$1
 	echo "run sql files on ${target_db_host}'s $sync_db_name"
-	sh $work_dir/db_execute_sql.sh $target_db_host $sync_db_name
+	sh $work_dir/db_execute_sql.sh $target_db_host $sync_db_name $target_db_port
 }
 
 database_list=`grep database_list $work_dir/config/db_config | cut -d "=" -f 2`