Commit 9ffeab39 authored by 温海元's avatar 温海元

Merge branch '4.96' into 1.15

parents abde7cf7 ecbc956e
Pipeline #864 failed with stages
...@@ -102,8 +102,8 @@ function db_schema_sync() ...@@ -102,8 +102,8 @@ function db_schema_sync()
echo "--- Step 3: sync schema: $database $target_db_host ---" echo "--- Step 3: sync schema: $database $target_db_host ---"
sh $work_dir/db_foreign_base.sh $target_db_host $sync_db_name $target_db_port sh $work_dir/db_foreign_base.sh $target_db_host $sync_db_name $target_db_port
echo "mss -conf ${config_file_name} -sync > /dev/null" echo "mss-new -conf ${config_file_name} -sync > /dev/null"
mss -conf ${config_file_name} -sync > /dev/null mss-new -conf ${config_file_name} -sync > /dev/null
echo "mysql-schema-sync result:$?" echo "mysql-schema-sync result:$?"
echo "--- Step 4: import basic data from backup file: $database $db_backup_sub_folders ---" echo "--- Step 4: import basic data from backup file: $database $db_backup_sub_folders ---"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment