cvs up -kk -j 1.16 -j 1.17 src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql

Pull from CVS head:
	Don't set DEFAULT '0' for the nas table

diff --git a/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql b/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql
index c95b28f..78c7436 100644 (file)
--- a/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql
+++ b/src/modules/rlm_sql/drivers/rlm_sql_mysql/db_mysql.sql
@@ -132,7 +132,7 @@ CREATE TABLE radpostauth (
 
 ######################################################################
 #
-#  The next two tables are commented out because they are not
+#  The next table is commented out because it is not
 #  currently used in the server.
 #
 
@@ -153,7 +153,7 @@ CREATE TABLE radpostauth (
 # Table structure for table 'nas'
 #
 CREATE TABLE nas (
-  id int(10) DEFAULT '0' NOT NULL auto_increment,
+  id int(10) NOT NULL auto_increment,
   nasname varchar(128) NOT NULL,
   shortname varchar(32),
   type varchar(30) DEFAULT 'other',
@@ -164,4 +164,3 @@ CREATE TABLE nas (
   PRIMARY KEY (id),
   KEY nasname (nasname)
 );
-