[asterisk-commits] tilghman: trunk r329615 - in /trunk: ./ cdr/cdr_odbc.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul 26 23:27:19 2011
New Revision: 329615

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=329615
Log:
Merged revisions 329614 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r329614 | tilghman | 2011-07-26 23:25:26 -0500 (Tue, 26 Jul 2011) | 13 lines
  
  Merged revisions 329613 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r329613 | tilghman | 2011-07-26 23:23:46 -0500 (Tue, 26 Jul 2011) | 6 lines
    
    Duration and billsec are swapped in high resolution time.
    
    Closes ASTERISK-18024
    Patches:
    	20110726__ASTERISK-18024.diff by Tilghman Lesher (License 5003)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/cdr/cdr_odbc.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-10-merged (original)
+++ branch-10-merged Tue Jul 26 23:27:19 2011
@@ -1,1 +1,1 @@
-/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145,329200,329204,329257,329331,329334,329472,329528,329538
+/branches/10:1-328075,328120,328162,328207,328247,328317,328329,328428-328429,328448,328451,328541,328609,328611,328664,328717,328771,328824,328879,328936,328992,329055,329145,329200,329204,329257,329331,329334,329472,329528,329538,329614

Modified: trunk/cdr/cdr_odbc.c
URL: http://svnview.digium.com/svn/asterisk/trunk/cdr/cdr_odbc.c?view=diff&rev=329615&r1=329614&r2=329615
==============================================================================
--- trunk/cdr/cdr_odbc.c (original)
+++ trunk/cdr/cdr_odbc.c Tue Jul 26 23:27:19 2011
@@ -108,8 +108,8 @@
 		}
 		hrduration = (double) ast_tvdiff_us(cdr->end, cdr->start) / 1000000.0;
 
-		SQLBindParameter(stmt, 9, SQL_PARAM_INPUT, SQL_C_DOUBLE, SQL_FLOAT, 0, 0, &hrbillsec, 0, NULL);
-		SQLBindParameter(stmt, 10, SQL_PARAM_INPUT, SQL_C_DOUBLE, SQL_FLOAT, 0, 0, &hrduration, 0, NULL);
+		SQLBindParameter(stmt, 9, SQL_PARAM_INPUT, SQL_C_DOUBLE, SQL_FLOAT, 0, 0, &hrduration, 0, NULL);
+		SQLBindParameter(stmt, 10, SQL_PARAM_INPUT, SQL_C_DOUBLE, SQL_FLOAT, 0, 0, &hrbillsec, 0, NULL);
 	} else {
 		SQLBindParameter(stmt, 9, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->duration, 0, NULL);
 		SQLBindParameter(stmt, 10, SQL_PARAM_INPUT, SQL_C_SLONG, SQL_INTEGER, 0, 0, &cdr->billsec, 0, NULL);