[svn-commits] qwell: trunk r343 - in /trunk: ./ cdr_addon_mysql.c

[svn-commits at lists.digium.com]

Author: qwell
Date: Thu Feb 15 16:26:33 2007
New Revision: 343

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

................
r342 | qwell | 2007-02-15 16:25:24 -0600 (Thu, 15 Feb 2007) | 10 lines

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

........
r341 | qwell | 2007-02-15 16:23:07 -0600 (Thu, 15 Feb 2007) | 2 lines

Fix a typo pointed out by kshummard

........

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

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

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Thu Feb 15 16:26:33 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-299,308,310,317,319,329
+/branches/1.4:1-299,308,310,317,319,329,342

Modified: trunk/cdr_addon_mysql.c
URL: http://svn.digium.com/view/asterisk-addons/trunk/cdr_addon_mysql.c?view=diff&rev=343&r1=342&r2=343
==============================================================================
--- trunk/cdr_addon_mysql.c (original)
+++ trunk/cdr_addon_mysql.c Thu Feb 15 16:26:33 2007
@@ -410,7 +410,7 @@
 	tmp = ast_variable_retrieve(cfg, "global", "userfield");
 	if (tmp) {
 		if (sscanf(tmp, "%d", &userfield) < 1) {
-			ast_log(LOG_WARNING, "Invalid MySQL configurtation file\n");
+			ast_log(LOG_WARNING, "Invalid MySQL configuration file\n");
 			userfield = 0;
 		}
 	}