Merged revisions 317486 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317486 | russell | 2011-05-05 18:15:53 -0500 (Thu, 05 May 2011) | 9 lines

  Fix some more realtime MySQL schema issues.

  (closes issue #18537)
  Reported by: denzs
  Patches:
        sipfriends.sql.svndiff uploaded by denzs (license 1182)
        queue_log.sql.svndiff uploaded by denzs (license 1182)
        meetme.sql.svndiff uploaded by denzs (license 1182)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@317487 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/contrib/realtime/mysql/queue_log.sql b/contrib/realtime/mysql/queue_log.sql
index 0b74f81..bc95e85 100644 (file)
--- a/contrib/realtime/mysql/queue_log.sql
+++ b/contrib/realtime/mysql/queue_log.sql
@@ -20,5 +20,5 @@ CREATE TABLE queue_log (
        data4 char(50),
        data5 char(50),
        index bydate (time),
-       index qname (queuename,datetime)
+       index qname (queuename,time)
 );

diff --git a/contrib/realtime/mysql/sipfriends.sql b/contrib/realtime/mysql/sipfriends.sql
index 93479a1..967cdf7 100644 (file)
--- a/contrib/realtime/mysql/sipfriends.sql
+++ b/contrib/realtime/mysql/sipfriends.sql
@@ -37,6 +37,7 @@ CREATE TABLE `sipfriends` (
   `outboundproxy` varchar(40),
   `ipaddr` varchar(40) NOT NULL default '',
   `defaultip` varchar(20),
+  `dtmfmode` varchar(7) default NULL,
   `port` int(6) NOT NULL default '0',
   `fullcontact` varchar(40),
   `insecure` varchar(20),