merge of 'ebf7c7e799b00cc44e631f47d644d492cac8a9aa'

and 'f93bc9e1291ae4d3aab97f39d7a28293e66adb43'

Monotone-Parent: ebf7c7e799b00cc44e631f47d644d492cac8a9aa
Monotone-Parent: f93bc9e1291ae4d3aab97f39d7a28293e66adb43
Monotone-Revision: 47874ea582a8f97d988110f4d4174d2668de0fb0

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2012-07-02T19:48:38
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,4 @@
+<<<<<<< variant A
 2012-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreRecurrenceUtils.m

SOPE/GDLContentStore/GCSSpecialQueries.m

@@ -180,8 +180,8 @@
 - (NSString *) createSessionsFolderWithName: (NSString *) tableName
 {
   static NSString *sqlFolderFormat
-    = (@"CREATE TABLE %@ (" 
-       @" c_id VARCHAR(255) PRIMARY KEY,"
+    = (@"CREATE TABLE %@ ("
+       @" c_id VARCHAR(255) NOT NULL PRIMARY KEY,"
        @" c_value VARCHAR(255) NOT NULL,"
        @" c_creationdate INT4 NOT NULL,"
        @" c_lastseen INT4 NOT NULL)");