diff options
| author | Andreas Unterkircher <unki@netshadow.at> | 2008-12-12 23:27:57 +0100 |
|---|---|---|
| committer | Andreas Unterkircher <unki@netshadow.at> | 2008-12-12 23:27:57 +0100 |
| commit | f1370d810782a2b4099ff31be83ca312051f9100 (patch) | |
| tree | 8ead7a9bccf7ba88fbdbf5a6eb0d32a4f287ea5d /doc/mysql-db-script.sql | |
| parent | 226ad0a3c764c0606048acf7371b02765eee60d2 (diff) | |
| download | exilog-f1370d810782a2b4099ff31be83ca312051f9100.zip exilog-f1370d810782a2b4099ff31be83ca312051f9100.tar.gz exilog-f1370d810782a2b4099ff31be83ca312051f9100.tar.bz2 | |
fix conflict on merging upstream from Tom Kistner
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
Diffstat (limited to 'doc/mysql-db-script.sql')
| -rw-r--r-- | doc/mysql-db-script.sql | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/mysql-db-script.sql b/doc/mysql-db-script.sql index 7ed82a6..c16ee41 100644 --- a/doc/mysql-db-script.sql +++ b/doc/mysql-db-script.sql @@ -20,7 +20,7 @@ CREATE TABLE `deferrals` ( `rcpt` varchar(200) NOT NULL default '', `rcpt_intermediate` varchar(200) default NULL, `rcpt_final` varchar(200) NOT NULL default '', - `host_addr` varchar(15) default NULL, + `host_addr` varchar(39) default NULL, `host_dns` varchar(255) default NULL, `tls_cipher` varchar(128) default NULL, `router` varchar(128) default NULL, @@ -48,7 +48,7 @@ CREATE TABLE `deliveries` ( `rcpt` varchar(200) NOT NULL default '', `rcpt_intermediate` varchar(200) default NULL, `rcpt_final` varchar(200) NOT NULL default '', - `host_addr` varchar(15) default NULL, + `host_addr` varchar(39) default NULL, `host_dns` varchar(255) default NULL, `tls_cipher` varchar(128) default NULL, `router` varchar(128) default NULL, @@ -76,7 +76,7 @@ CREATE TABLE `errors` ( `rcpt` varchar(200) NOT NULL default '', `rcpt_intermediate` varchar(200) default NULL, `rcpt_final` varchar(200) NOT NULL default '', - `host_addr` varchar(15) default NULL, + `host_addr` varchar(39) default NULL, `host_dns` varchar(255) default NULL, `tls_cipher` varchar(128) default NULL, `router` varchar(128) default NULL, @@ -104,7 +104,7 @@ CREATE TABLE `messages` ( `msgid` varchar(255) default NULL, `completed` bigint(20) default NULL, `mailfrom` varchar(255) default NULL, - `host_addr` varchar(15) default NULL, + `host_addr` varchar(39) default NULL, `host_rdns` varchar(255) default NULL, `host_ident` varchar(255) default NULL, `host_helo` varchar(255) default NULL, @@ -164,7 +164,7 @@ CREATE TABLE `rejects` ( `server` varchar(32) NOT NULL default '', `message_id` varchar(16) binary default NULL, `timestamp` bigint(20) NOT NULL default '0', - `host_addr` varchar(15) NOT NULL default '', + `host_addr` varchar(39) NOT NULL default '', `host_rdns` varchar(255) NOT NULL default '', `host_ident` varchar(255) default NULL, `host_helo` varchar(255) default NULL, |