[asterisk-addons-commits] file: trunk r406 - in /trunk: ./ cdr_addon_mysql.c

[SVN commits to the Asterisk addons project]

Author: file
Date: Thu Jun 21 10:11:48 2007
New Revision: 406

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=406
Log:
Merged revisions 405 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.4

................
r405 | file | 2007-06-21 11:09:38 -0400 (Thu, 21 Jun 2007) | 10 lines

Merged revisions 404 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.2

........
r404 | file | 2007-06-21 11:08:22 -0400 (Thu, 21 Jun 2007) | 2 lines

Use mysql_errno to get the error instead of mysql_ping's return value. (issue #9434 reported by lupino3)

........

................

Modified:
    trunk/   (props changed)
    trunk/cdr_addon_mysql.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Jun 21 10:11:48 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398
+/branches/1.4:1-299,308,310,317,319,329,342,348,358,380,382,387,389,398,405

Modified: trunk/cdr_addon_mysql.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/cdr_addon_mysql.c?view=diff&rev=406&r1=405&r2=406
==============================================================================
--- trunk/cdr_addon_mysql.c (original)
+++ trunk/cdr_addon_mysql.c Thu Jun 21 10:11:48 2007
@@ -166,7 +166,7 @@
 		if ((error = mysql_ping(&mysql))) {
 			connected = 0;
 			records = 0;
-			switch (error) {
+			switch (mysql_errno(&mysql)) {
 				case CR_SERVER_GONE_ERROR:
 				case CR_SERVER_LOST:
 					ast_log(LOG_ERROR, "cdr_mysql: Server has gone away. Attempting to reconnect.\n");