From: Tilghman Lesher Date: Sat, 18 Jul 2009 04:17:53 +0000 (+0000) Subject: Recorded merge of revisions 207317 via svnmerge from X-Git-Tag: 1.6.1.3-rc1~42 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62ea47ddc8016042fb1300e8e8eef1a786925e67;p=thirdparty%2Fasterisk.git 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. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@207321 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c index 375002b262..91c3de9947 100644 --- a/apps/app_voicemail.c +++ b/apps/app_voicemail.c @@ -3118,7 +3118,7 @@ static void copy_file(char *sdir, int smsg, char *ddir, int dmsg, char *dmailbox 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);