[svn-commits] tilghman: branch 1.6.1 r984 - in /branches/1.6.1: ./ res/res_config_mysql.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Mon Jul  6 16:33:54 2009
New Revision: 984

URL: http://svn.asterisk.org/svn-view/asterisk-addons?view=rev&rev=984
Log:
Merged revisions 982 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/trunk

................
  r982 | tilghman | 2009-07-06 16:31:41 -0500 (Mon, 06 Jul 2009) | 14 lines
  
  Recorded merge of revisions 981 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk-addons/branches/1.4
  
  ........
    r981 | tilghman | 2009-07-06 16:30:13 -0500 (Mon, 06 Jul 2009) | 7 lines
    
    Don't reset reconnect time, unless a reconnect really occurred.
    (closes issue #15375)
     Reported by: kowalma
     Patches: 
           20090628__issue15375.diff.txt uploaded by tilghman (license 14)
     Tested by: kowalma, jacco
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/res/res_config_mysql.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-merged (original)
+++ trunk-merged Mon Jul  6 16:33:54 2009
@@ -1,1 +1,1 @@
-/trunk:1-690,707,711,715,719,725-726,730,887,910,933,960
+/trunk:1-690,707,711,715,719,725-726,730,887,910,933,960,982

Modified: branches/1.6.1/res/res_config_mysql.c
URL: http://svn.asterisk.org/svn-view/asterisk-addons/branches/1.6.1/res/res_config_mysql.c?view=diff&rev=984&r1=983&r2=984
==============================================================================
--- branches/1.6.1/res/res_config_mysql.c (original)
+++ branches/1.6.1/res/res_config_mysql.c Mon Jul  6 16:33:54 2009
@@ -1456,6 +1456,7 @@
 			ast_log(LOG_ERROR, "MySQL RealTime: Failed to connect database server %s on %s (err %d). Check debug for more info.\n", conn->name, !ast_strlen_zero(conn->host) ? conn->host : conn->sock, mysql_errno(&conn->handle));
 			ast_debug(1, "MySQL RealTime: Cannot Connect (%d): %s\n", mysql_errno(&conn->handle), mysql_error(&conn->handle));
 			conn->connected = 0;
+			conn->connect_time = 0;
 			return 0;
 		}
 	} else {
@@ -1463,13 +1464,16 @@
 		 * So the postman pings twice. */
 		if (mysql_ping(&conn->handle) != 0 && (usleep(1) + 2 > 0) && mysql_ping(&conn->handle) != 0) {
 			conn->connected = 0;
+			conn->connect_time = 0;
 			ast_log(LOG_ERROR, "MySQL RealTime: Ping failed (%d).  Trying an explicit reconnect.\n", mysql_errno(&conn->handle));
 			ast_debug(1, "MySQL RealTime: Server Error (%d): %s\n", mysql_errno(&conn->handle), mysql_error(&conn->handle));
 			goto reconnect_tryagain;
 		}
 
-		conn->connected = 1;
-		conn->connect_time = time(NULL);
+		if (!conn->connected) {
+			conn->connected = 1;
+			conn->connect_time = time(NULL);
+		}
 
 		if (mysql_select_db(&conn->handle, conn->name) != 0) {
 			ast_log(LOG_WARNING, "MySQL RealTime: Unable to select database: %s. Still Connected (%u) - %s.\n", conn->name, mysql_errno(&conn->handle), mysql_error(&conn->handle));
@@ -1553,7 +1557,7 @@
 			AST_LIST_TRAVERSE(&cur->columns, col, list) {
 				ast_cli(a->fd, "%-20.20s %-20.20s %3d\n", col->name, col->type, col->len);
 			}
-			ast_mutex_unlock(&cur->lock);
+			release_table(cur);
 		} else {
 			ast_cli(a->fd, "No such table '%s'\n", a->argv[3]);
 		}