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 375002b262f9e329992bd279623db7c70dfe0baa..91c3de99476ae18dd57a5012db1e0b4c337bc4ac 100644 (file)
--- 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);