Merge "Add default case for mysqld_bin"

2013-11-21 20:05:34 +00:00
parent ad4bbe19bc ce5e8b5150
commit 5cbb432851
1 changed files with 2 additions and 0 deletions
--- a/trove/guestagent/datastore/mysql/service.py
+++ b/trove/guestagent/datastore/mysql/service.py
@@ -114,6 +114,8 @@ def load_mysqld_options():
        if os.path.isfile(bin):
            mysqld_bin = bin
            break
+    else:
+        return {}
    try:
        out, err = utils.execute(mysqld_bin, "--print-defaults",
                                 run_as_root=True, root_helper="sudo")