Fix Bug#: 531 "The mysql sample configuration uses " = NULL", but it needs to be...

diff --git a/raddb/sql/mysql/ippool.conf b/raddb/sql/mysql/ippool.conf
index 891dae6..99f78c2 100644 (file)
--- a/raddb/sql/mysql/ippool.conf
+++ b/raddb/sql/mysql/ippool.conf
@@ -8,7 +8,7 @@
 # allocate-clear = "UPDATE ${ippool_table} \
 #  SET nasipaddress = '', pool_key = 0, \
 #  callingstationid = '', username = '', \
-#  expiry_time = NULL \
+#  expiry_time IS NULL \
 #  WHERE pool_key = '${pool-key}'"
 
 ## This series of queries allocates an IP address
@@ -19,7 +19,7 @@
  allocate-clear = "UPDATE ${ippool_table} \
   SET nasipaddress = '', pool_key = 0, \
   callingstationid = '', username = '', \
-  expiry_time = NULL \
+  expiry_time IS NULL \
   WHERE expiry_time <= NOW() - INTERVAL 1 SECOND
   AND nasipaddress = '%{Nas-IP-Address}'"
 
@@ -39,7 +39,7 @@ allocate-find = "SELECT framedipaddress FROM ${ippool_table} \
 # ## use this query instead
 # allocate-find = "SELECT framedipaddress FROM ${ippool_table} \
 #  WHERE pool_name = '%{control:Pool-Name}' \
-#  AND expiry_time = NULL \
+#  AND expiry_time IS NULL \
 #  ORDER BY RAND() \
 #  LIMIT 1 \
 #  FOR UPDATE"
@@ -73,7 +73,7 @@ start-update = "UPDATE ${ippool_table} \
 ## STOP record arrives
 stop-clear = "UPDATE ${ippool_table} \
  SET nasipaddress = '', pool_key = 0, callingstationid = '', username = '', \
- expiry_time = NULL \
+ expiry_time IS NULL \
  WHERE nasipaddress = '%{Nas-IP-Address}' AND pool_key = '${pool-key}' \
  AND username = '%{User-Name}' \
  AND callingstationid = '%{Calling-Station-Id}' \
@@ -96,13 +96,13 @@ alive-update = "UPDATE ${ippool_table} \
 ## NAS when an accounting ON record arrives
 on-clear = "UPDATE ${ippool_table} \
  SET nasipaddress = '', pool_key = 0, callingstationid = '', username = '', \
- expiry_time = NULL \
+ expiry_time IS NULL \
  WHERE nasipaddress = '%{Nas-IP-Address}'"
 
 ## This series of queries frees the IP numbers allocate to a
 ## NAS when an accounting OFF record arrives
 off-clear = "UPDATE ${ippool_table} \
  SET nasipaddress = '', pool_key = 0, callingstationid = '', username = '', \
- expiry_time = NULL \
+ expiry_time IS NULL \
  WHERE nasipaddress = '%{Nas-IP-Address}'"