From e3caaf59c20fd556364f838ae6082b3e2fba6d56 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Thu, 17 May 2007 11:58:51 -0400
Subject: [PATCH] Use global filters and bind username/ for Ldap searches (#1484159)
---
SQL/mysql5.initial.sql | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/SQL/mysql5.initial.sql b/SQL/mysql5.initial.sql
index 24e1431..fb1d69e 100644
--- a/SQL/mysql5.initial.sql
+++ b/SQL/mysql5.initial.sql
@@ -29,7 +29,7 @@
`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`last_login` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
`language` varchar(5) NOT NULL DEFAULT 'en',
- `preferences` text NOT NULL,
+ `preferences` text NOT NULL DEFAULT '',
PRIMARY KEY(`user_id`)
) TYPE=MYISAM CHARACTER SET ascii COLLATE ascii_general_ci;
@@ -55,7 +55,7 @@
PRIMARY KEY(`message_id`),
INDEX `idx`(`idx`),
INDEX `uid`(`uid`),
- UNIQUE `uniqueness` (`cache_key`, `uid`),
+ UNIQUE `uniqueness` (`user_id`, `cache_key`, `uid`),
CONSTRAINT `User_ID_FK_messages` FOREIGN KEY (`user_id`)
REFERENCES `users`(`user_id`)
ON DELETE CASCADE
@@ -114,6 +114,7 @@
`reply-to` varchar(128) NOT NULL,
`bcc` varchar(128) NOT NULL,
`signature` text NOT NULL,
+ `html_signature` tinyint(1) NOT NULL DEFAULT '0',
`user_id` int(10) UNSIGNED NOT NULL DEFAULT '0',
PRIMARY KEY(`identity_id`),
CONSTRAINT `User_ID_FK_identities` FOREIGN KEY (`user_id`)
@@ -123,4 +124,4 @@
) TYPE=MYISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
-SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
+SET FOREIGN_KEY_CHECKS=1;
--
Gitblit v1.9.1