[asterisk-addons-commits] file: branch 1.4 r405 - in /branches/1.4: ./ cdr_addon_mysql.c

[SVN commits to the Asterisk addons project]

Author: file
Date: Thu Jun 21 10:09:38 2007
New Revision: 405

URL: http://svn.digium.com/view/asterisk-addons?view=rev&rev=405
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/cdr_addon_mysql.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Thu Jun 21 10:09:38 2007
@@ -1,1 +1,1 @@
-/branches/1.2:1-183,209,211,257-258,264,268-273,305-328,332-336,339-344,346-351,357
+/branches/1.2:1-183,209,211,257-258,264,268-273,305-328,332-336,339-344,346-351,357,404

Modified: branches/1.4/cdr_addon_mysql.c
URL: http://svn.digium.com/view/asterisk-addons/branches/1.4/cdr_addon_mysql.c?view=diff&rev=405&r1=404&r2=405
==============================================================================
--- branches/1.4/cdr_addon_mysql.c (original)
+++ branches/1.4/cdr_addon_mysql.c Thu Jun 21 10:09:38 2007
@@ -154,7 +154,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");