Index: sql/mysql/dialup.conf
===================================================================
RCS file: /source/radiusd/raddb/sql/mysql/dialup.conf,v
retrieving revision 1.4
diff -u -r1.4 dialup.conf
--- sql/mysql/dialup.conf	17 Sep 2007 21:09:50 -0000	1.4
+++ sql/mysql/dialup.conf	8 Oct 2007 11:45:04 -0000
@@ -143,7 +143,7 @@
              acctterminatecause =  '%{Acct-Terminate-Cause}', \
              acctstopdelay      =  %{%{Acct-Delay-Time}:-0} \
           WHERE acctsessiontime =  0 \
-          AND acctstoptime      =  0 \
+          AND acctstoptime      =  NULL \
           AND nasipaddress      =  '%{NAS-IP-Address}' \
           AND acctstarttime     <= '%S'"
 
@@ -202,7 +202,7 @@
             ('%{Acct-Session-Id}', '%{Acct-Unique-Session-Id}', \
              '%{SQL-User-Name}', \
              '%{Realm}', '%{NAS-IP-Address}', '%{NAS-Port}', \
-             '%{NAS-Port-Type}', '%S', '0', \
+             '%{NAS-Port-Type}', '%S', NULL, \
              '0', '%{Acct-Authentic}', '%{Connect-Info}', \
              '', '0', '0', \
              '%{Called-Station-Id}', '%{Calling-Station-Id}', '', \
@@ -277,14 +277,14 @@
 	#simul_count_query = "SELECT COUNT(*) \
                              #FROM ${acct_table1} \
                              #WHERE username = '%{SQL-User-Name}' \
-                             #AND acctstoptime = 0"
+                             #AND acctstoptime = NULL"
 
 	simul_verify_query  = "SELECT radacctid, acctsessionid, username, \
                                nasipaddress, nasportid, framedipaddress, \
                                callingstationid, framedprotocol \
                                FROM ${acct_table1} \
                                WHERE username = '%{SQL-User-Name}' \
-                               AND acctstoptime = 0"
+                               AND acctstoptime = NULL"
 
 	#######################################################################
 	# Authentication Logging Queries
Index: sql/mysql/ippool.conf
===================================================================
RCS file: /source/radiusd/raddb/sql/mysql/ippool.conf,v
retrieving revision 1.3
diff -u -r1.3 ippool.conf
--- sql/mysql/ippool.conf	23 Jul 2007 14:34:27 -0000	1.3
+++ sql/mysql/ippool.conf	8 Oct 2007 11:45:04 -0000
@@ -6,7 +6,7 @@
 # allocate-clear = "UPDATE ${ippool_table} \
 #  SET nasipaddress = '', pool_key = 0, \
 #  callingstationid = '', username = '', \
-#  expiry_time = '0000-00-00 00:00:00' \
+#  expiry_time = NULL \
 #  WHERE pool_key = '${pool-key}'"
 
 ## This series of queries allocates an IP address
@@ -17,7 +17,7 @@
  allocate-clear = "UPDATE ${ippool_table} \
   SET nasipaddress = '', pool_key = 0, \
   callingstationid = '', username = '', \
-  expiry_time = '0000-00-00 00:00:00' \
+  expiry_time = NULL \
   WHERE expiry_time <= NOW() - INTERVAL 1 SECOND
   AND nasipaddress = '%{Nas-IP-Address}'"
 
@@ -37,7 +37,7 @@
 # ## use this query instead
 # allocate-find = "SELECT framedipaddress FROM ${ippool_table} \
 #  WHERE pool_name = '%{control:Pool-Name}' \
-#  AND expiry_time = '0000-00-00 00:00:00' \
+#  AND expiry_time = NULL \
 #  ORDER BY RAND() \
 #  LIMIT 1 \
 #  FOR UPDATE"
@@ -71,7 +71,7 @@
 ## STOP record arrives
 stop-clear = "UPDATE ${ippool_table} \
  SET nasipaddress = '', pool_key = 0, callingstationid = '', username = '', \
- expiry_time = '0000-00-00 00:00:00' \
+ expiry_time = NULL \
  WHERE nasipaddress = '%{Nas-IP-Address}' AND pool_key = '${pool-key}' \
  AND username = '%{User-Name}' \
  AND callingstationid = '%{Calling-Station-Id}' \
@@ -94,13 +94,13 @@
 ## NAS when an accounting ON record arrives
 on-clear = "UPDATE ${ippool_table} \
  SET nasipaddress = '', pool_key = 0, callingstationid = '', username = '', \
- expiry_time = '0000-00-00 00:00:00' \
+ expiry_time = 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 = '0000-00-00 00:00:00' \
+ expiry_time = NULL \
  WHERE nasipaddress = '%{Nas-IP-Address}'"
 
Index: sql/mysql/ippool.sql
===================================================================
RCS file: /source/radiusd/raddb/sql/mysql/ippool.sql,v
retrieving revision 1.3
diff -u -r1.3 ippool.sql
--- sql/mysql/ippool.sql	23 Jul 2007 14:34:27 -0000	1.3
+++ sql/mysql/ippool.sql	8 Oct 2007 11:45:04 -0000
@@ -8,7 +8,7 @@
   nasipaddress          varchar(15) NOT NULL default '',
   calledstationid       VARCHAR(30) NOT NULL,
   callingstationid      VARCHAR(30) NOT NULL,
-  expiry_time           DATETIME NOT NULL default '0000-00-00 00:00:00',
+  expiry_time           DATETIME NULL default NULL,
   username              varchar(64) NOT NULL default '',
   pool_key              varchar(30) NOT NULL,
   PRIMARY KEY (id)
Index: sql/mysql/schema.sql
===================================================================
RCS file: /source/radiusd/raddb/sql/mysql/schema.sql,v
retrieving revision 1.6
diff -u -r1.6 schema.sql
--- sql/mysql/schema.sql	17 Sep 2007 21:09:50 -0000	1.6
+++ sql/mysql/schema.sql	8 Oct 2007 11:45:04 -0000
@@ -24,8 +24,8 @@
   nasipaddress varchar(15) NOT NULL default '',
   nasportid varchar(15) default NULL,
   nasporttype varchar(32) default NULL,
-  acctstarttime datetime NOT NULL default '0000-00-00 00:00:00',
-  acctstoptime datetime NOT NULL default '0000-00-00 00:00:00',
+  acctstarttime datetime NULL default NULL,
+  acctstoptime datetime NULL default NULL,
   acctsessiontime int(12) default NULL,
   acctauthentic varchar(32) default NULL,
   connectinfo_start varchar(50) default NULL,