summaryrefslogtreecommitdiff
path: root/configs/mergeepg.sql
diff options
context:
space:
mode:
authorhorchi <vdr@jwendel.de>2018-01-02 17:01:16 +0100
committerhorchi <vdr@jwendel.de>2018-01-02 17:01:16 +0100
commit67c936be3377781ccf12868e6d9ca3b7859ee2a0 (patch)
treef216328536422c95cb7b636bfcd0cd8b6ac456c9 /configs/mergeepg.sql
parent8e7b2dba8e61966445416a239c9f54a84f91730d (diff)
downloadvdr-epg-daemon-67c936be3377781ccf12868e6d9ca3b7859ee2a0.tar.gz
vdr-epg-daemon-67c936be3377781ccf12868e6d9ca3b7859ee2a0.tar.bz2
2017-01-02: version 1.1.126 (ckone)\n - change: improved handling of reinstated events in merge procedure\n\n1.1.126
Diffstat (limited to 'configs/mergeepg.sql')
-rw-r--r--configs/mergeepg.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/mergeepg.sql b/configs/mergeepg.sql
index bde021a..62c2144 100644
--- a/configs/mergeepg.sql
+++ b/configs/mergeepg.sql
@@ -45,7 +45,7 @@ update
events v
left join
events e
- on e.masterid = v.useid and v.masterid != e.masterid and e.updflg in ('T','C') and e.delflg is Null
+ on e.masterid = v.useid and v.masterid != e.masterid and e.updflg in ('T','C') and ifnull(e.delflg,'N') = 'N'
where
v.updflg in('L') and
v.starttime + v.duration >= unix_timestamp()