Don't reconnect db on reload unless there was a failure

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1741 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_iax.c b/channels/chan_iax.c
index 4b3b3c1c15228ca0287a0d1dd5cf49eaa4faa04c..ce36153e7b25be5d00cbdc2cd9872cd1de733e6a 100755 (executable)
--- a/channels/chan_iax.c
+++ b/channels/chan_iax.c
@@ -4932,7 +4932,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin){
        ast_destroy(cfg);
 #ifdef MYSQL_FRIENDS
        /* Connect to db if appropriate */
-       if (strlen(mydbname)) {
+       if (!mysql && strlen(mydbname)) {
                mysql = mysql_init(NULL);
                if (!mysql_real_connect(mysql, mydbhost[0] ? mydbhost : NULL, mydbuser, mydbpass, mydbname, 0, NULL, 0)) {
                        memset(mydbpass, '*', strlen(mydbpass));

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 5c986cdbe60b273b7e131b2bcb13153f10fffd0a..d05e29c311db5d78ce40f0a8459cdc189a0d84e0 100755 (executable)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5516,7 +5516,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin){
        set_timing();
 #ifdef MYSQL_FRIENDS
        /* Connect to db if appropriate */
-       if (strlen(mydbname)) {
+       if (!mysql && strlen(mydbname)) {
                mysql = mysql_init(NULL);
                if (!mysql_real_connect(mysql, mydbhost[0] ? mydbhost : NULL, mydbuser, mydbpass, mydbname, 0, NULL, 0)) {
                        memset(mydbpass, '*', strlen(mydbpass));