[netfilter-cvslog] r7342 - branches/ulog/ulogd2/doc

[pablo at netfilter.org]

Author: pablo at netfilter.org
Date: 2008-02-03 13:26:32 +0100 (Sun, 03 Feb 2008)
New Revision: 7342

Modified:
   branches/ulog/ulogd2/doc/mysql-ulogd2.sql
Log:
From: Pierre Chifflier <chifflier at inl.fr>

SQL standard says a function has to be called with SELECT and not CALL.
This patch modify code accordingly.


Modified: branches/ulog/ulogd2/doc/mysql-ulogd2.sql
===================================================================
--- branches/ulog/ulogd2/doc/mysql-ulogd2.sql	2008-02-03 12:26:01 UTC (rev 7341)
+++ branches/ulog/ulogd2/doc/mysql-ulogd2.sql	2008-02-03 12:26:32 UTC (rev 7342)
@@ -157,8 +157,8 @@
         oob_in,
 	oob_out,
 	oob_family,
-        ip_saddr as ip_saddr_bin,
-        ip_daddr as ip_daddr_bin,
+        ip_saddr AS ip_saddr_bin,
+        ip_daddr AS ip_daddr_bin,
         ip_protocol,
         ip_tos,
         ip_ttl,
@@ -188,8 +188,8 @@
         icmp_echoseq,
         icmp_gateway,
         icmp_fragmtu
-        FROM ulog2 INNER JOIN tcp ON ulog2._id = tcp._tcp_id INNER JOIN udp ON ulog2._id = udp._udp_id
-                INNER JOIN icmp ON ulog2._id = icmp._icmp_id INNER JOIN mac ON ulog2._id = mac._mac_id;
+        FROM ulog2 LEFT JOIN tcp ON ulog2._id = tcp._tcp_id LEFT JOIN udp ON ulog2._id = udp._udp_id
+                LEFT JOIN icmp ON ulog2._id = icmp._icmp_id LEFT JOIN mac ON ulog2._id = mac._mac_id;
 
 -- shortcuts
 DROP VIEW IF EXISTS `view_tcp_quad`;