From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 5 May 2011 23:13:04 +0000 (+0000)
Subject: Merged revisions 317484 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1624
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6a4b811b7dfec36c3f24da0619b899a253082c1;p=thirdparty%2Fasterisk.git

Merged revisions 317484 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r317484 | russell | 2011-05-05 18:12:35 -0500 (Thu, 05 May 2011) | 8 lines

  Fix some errors in sample MySQL realtime schema files.

  (closes issue #18915)
  Reported by: Dovid
  Patches:
        sipfriends.patch uploaded by Dovid (license 652)
        meetme.patch uploaded by Dovid (license 652)
........


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

diff --git a/contrib/realtime/mysql/meetme.sql b/contrib/realtime/mysql/meetme.sql
index 7e79a8c747..5a1bac4bfc 100644
--- a/contrib/realtime/mysql/meetme.sql
+++ b/contrib/realtime/mysql/meetme.sql
@@ -15,7 +15,7 @@ CREATE TABLE meetme (
 	recordingformat char(10) NULL,
 	maxusers int(11) NULL,
 	members integer DEFAULT 0 NOT NULL,
-	index confno (confno,starttime,endtime)
-	PRIMARY KEY (bookid),
+	index confno (confno,starttime,endtime),
+	PRIMARY KEY (bookid)
 );
 
diff --git a/contrib/realtime/mysql/sipfriends.sql b/contrib/realtime/mysql/sipfriends.sql
index c7f10e934e..93479a1cb0 100644
--- a/contrib/realtime/mysql/sipfriends.sql
+++ b/contrib/realtime/mysql/sipfriends.sql
@@ -51,5 +51,5 @@ CREATE TABLE `sipfriends` (
   `setvar` varchar(200),
   PRIMARY KEY  (`name`),
   INDEX host (host, port),
-  INDEX ipaddr (ipaddr, port),
-) TYPE=MyISAM;
+  INDEX ipaddr (ipaddr, port)
+) ENGINE=MyISAM;