[svn-commits] tilghman: branch 1.6.1 r207321 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Fri Jul 17 23:17:53 2009
New Revision: 207321

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=207321
Log:
Recorded merge of revisions 207317 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r207317 | tilghman | 2009-07-17 23:16:44 -0500 (Fri, 17 Jul 2009) | 3 lines
  
  Flag field in wrong position.
  Reported by "Hoggins!" on asterisk-dev list.
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=207321&r1=207320&r2=207321
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Fri Jul 17 23:17:53 2009
@@ -3118,7 +3118,7 @@
 	if (obj) {
 		snprintf(msgnums, sizeof(msgnums), "%d", smsg);
 		snprintf(msgnumd, sizeof(msgnumd), "%d", dmsg);
-		snprintf(sql, sizeof(sql), "INSERT INTO %s (dir, msgnum, context, macrocontext, callerid, origtime, duration, recording, mailboxuser, mailboxcontext, flag) SELECT ?,?,context,macrocontext,callerid,origtime,duration,recording,flag,?,? FROM %s WHERE dir=? AND msgnum=?",odbc_table,odbc_table);
+		snprintf(sql, sizeof(sql), "INSERT INTO %s (dir, msgnum, context, macrocontext, callerid, origtime, duration, recording, flag, mailboxuser, mailboxcontext) SELECT ?,?,context,macrocontext,callerid,origtime,duration,recording,flag,?,? FROM %s WHERE dir=? AND msgnum=?",odbc_table,odbc_table);
 		stmt = ast_odbc_prepare_and_execute(obj, generic_prepare, &gps);
 		if (!stmt)
 			ast_log(AST_LOG_WARNING, "SQL Execute error!\n[%s] (You probably don't have MySQL 4.1 or later installed)\n\n", sql);