diff options
| author | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:19:02 +0000 |
|---|---|---|
| committer | Tobias Hößl <tobias@hoessl.eu> | 2012-02-28 21:19:02 +0000 |
| commit | 3d249f0eddb058f74b33d8205202b17ab7555aa6 (patch) | |
| tree | 112e38aa464e5830832ff92a93e10f2566cbe27e /database.sql | |
| parent | 36a1a43f06dc2a0d55463c83154cce55fa3948ad (diff) | |
| parent | 733f830be4b554c83361e877a5f1108767a815fc (diff) | |
| download | volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.gz volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.tar.bz2 volse-hubzilla-3d249f0eddb058f74b33d8205202b17ab7555aa6.zip | |
Merge remote branch 'upstream/master'
Diffstat (limited to 'database.sql')
| -rwxr-xr-x | database.sql | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/database.sql b/database.sql index 9ad96ca77..8c74ecddf 100755 --- a/database.sql +++ b/database.sql @@ -634,7 +634,8 @@ CREATE TABLE IF NOT EXISTS `mailacct` ( `mailbox` CHAR( 255 ) NOT NULL, `user` CHAR( 255 ) NOT NULL , `pass` TEXT NOT NULL , -`reply_to` CHAR( 255 ) NOT NULL , +`action` INT NOT NULL , +`movetofolder` CHAR(255) NOT NULL , `pubmail` TINYINT(1) NOT NULL DEFAULT '0', `last_check` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' ) ENGINE = MyISAM DEFAULT CHARSET=utf8; @@ -837,4 +838,17 @@ INDEX ( `master-parent-item` ), INDEX ( `receiver-uid` ) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; +CREATE TABLE IF NOT EXISTS `spam` ( +`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , +`uid` INT NOT NULL, +`spam` INT NOT NULL DEFAULT '0', +`ham` INT NOT NULL DEFAULT '0', +`term` CHAR(255) NOT NULL, +`date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', +INDEX ( `uid` ), +INDEX ( `spam` ), +INDEX ( `ham` ), +INDEX ( `term` ) +) ENGINE = MyISAM DEFAULT CHARSET=utf8; + |