[asterisk-addons-commits] trunk - r180 in /trunk: ./ Makefile cdr_addon_mysql.c

[asterisk-addons-commits at lists.digium.com]

Author: kpfleming
Date: Thu Dec  1 18:56:55 2005
New Revision: 180

URL: http://svn.digium.com/view/asterisk-addons?rev=180&view=rev
Log:
Merged revisions 178-179 via svnmerge from 
https://origsvn.digium.com/svn/asterisk-addons/branches/1.2

........
r178 | kpfleming | 2005-12-01 17:14:28 -0600 (Thu, 01 Dec 2005) | 2 lines

Makefile 'update' target now supports updating from Subversion repositories (issue #5875)

........
r179 | kpfleming | 2005-12-01 18:34:41 -0600 (Thu, 01 Dec 2005) | 2 lines

if we're going to forget that the connection is open, we should close it too (issue #5895)

........

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

Propchange: trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Dec  1 18:56:55 2005
@@ -1,1 +1,1 @@
-/branches/1.2:1-176
+/branches/1.2:1-179

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk-addons/trunk/Makefile?rev=180&r1=179&r2=180&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Thu Dec  1 18:56:55 2005
@@ -84,9 +84,12 @@
 	./mkdep $(CFLAGS) `ls *.c`
 
 update:
-	@if [ -d CVS ]; then \
+	@if [ -d .svn ]; then \
+		echo "Updating from Subversion..." ; \
+		svn update -q; \
+	elif [ -d CVS ]; then \
 		echo "Updating from CVS..." ; \
 		cvs -q -z3 update -Pd; \
 	else \
-		echo "Not CVS";  \
+		echo "Not under version control"; \
 	fi

Modified: trunk/cdr_addon_mysql.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/cdr_addon_mysql.c?rev=180&r1=179&r2=180&view=diff
==============================================================================
--- trunk/cdr_addon_mysql.c (original)
+++ trunk/cdr_addon_mysql.c Thu Dec  1 18:56:55 2005
@@ -224,6 +224,7 @@
 	if (connected) {
 		if (mysql_real_query(&mysql, sqlcmd, strlen(sqlcmd))) {
 			ast_log(LOG_ERROR, "mysql_cdr: Failed to insert into database: (%d) %s", mysql_errno(&mysql), mysql_error(&mysql));
+			mysql_close(&mysql);
 			connected = 0;
 		} else {
 			records++;