[#2071] Fixed globing vs find

diff --git a/src/bin/admin/tests/mysql_tests.sh.in b/src/bin/admin/tests/mysql_tests.sh.in
index 8216bc8b176ee3be0f89910c9ea893b238819bfa..9151fbe73a727d1752c93c6789914671a6166b1c 100644 (file)
--- a/src/bin/admin/tests/mysql_tests.sh.in
+++ b/src/bin/admin/tests/mysql_tests.sh.in
@@ -276,7 +276,7 @@ mysql_upgrade_schema_to_version() {
     fi
 
     # Check if there are any files in it
-    num_files=$(find ${upgrade_scripts_dir}/upgrade*.sh -type f | wc -l)
+    num_files=$(find ${upgrade_scripts_dir} -name 'upgrade*.sh' -type f | wc -l)
     if [ "${num_files}" -eq 0 ]; then
         upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/mysql
 

diff --git a/src/bin/admin/tests/pgsql_tests.sh.in b/src/bin/admin/tests/pgsql_tests.sh.in
index b9fbcb1fc3eec4d84420b060eed2110182593e79..54d8d6c2850421d984b06deb82964f1f607588b5 100644 (file)
--- a/src/bin/admin/tests/pgsql_tests.sh.in
+++ b/src/bin/admin/tests/pgsql_tests.sh.in
@@ -1118,7 +1118,7 @@ pgsql_upgrade_schema_to_version() {
     fi
 
     # Check if there are any files in it
-    num_files=$(find ${upgrade_scripts_dir}/upgrade*.sh -type f | wc -l)
+    num_files=$(find ${upgrade_scripts_dir} -name 'upgrade*.sh' -type f | wc -l)
     if [ "${num_files}" -eq 0 ]; then
         upgrade_scripts_dir=@abs_top_builddir@/src/share/database/scripts/pgsql