[svn-commits] russell: trunk r317485 - in /trunk: ./ contrib/realtime/mysql/

[SVN commits to the Digium repositories]

Author: russell
Date: Thu May  5 18:13:04 2011
New Revision: 317485

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=317485
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/contrib/realtime/mysql/meetme.sql
    trunk/contrib/realtime/mysql/sipfriends.sql

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/contrib/realtime/mysql/meetme.sql
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/realtime/mysql/meetme.sql?view=diff&rev=317485&r1=317484&r2=317485
==============================================================================
--- trunk/contrib/realtime/mysql/meetme.sql (original)
+++ trunk/contrib/realtime/mysql/meetme.sql Thu May  5 18:13:04 2011
@@ -15,7 +15,7 @@
 	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)
 );
 

Modified: trunk/contrib/realtime/mysql/sipfriends.sql
URL: http://svnview.digium.com/svn/asterisk/trunk/contrib/realtime/mysql/sipfriends.sql?view=diff&rev=317485&r1=317484&r2=317485
==============================================================================
--- trunk/contrib/realtime/mysql/sipfriends.sql (original)
+++ trunk/contrib/realtime/mysql/sipfriends.sql Thu May  5 18:13:04 2011
@@ -51,5 +51,5 @@
   `setvar` varchar(200),
   PRIMARY KEY  (`name`),
   INDEX host (host, port),
-  INDEX ipaddr (ipaddr, port),
-) TYPE=MyISAM;
+  INDEX ipaddr (ipaddr, port)
+) ENGINE=MyISAM;