*** ./doc/manual-html/manual.html	Sat Jul 26 05:29:59 1997
--- ../msql-2.0.3/./doc/manual-html/manual.html	Fri Apr 17 09:31:41 1998
***************
*** 127,133 ****
  </B></FONT><FONT SIZE=2><P ALIGN="JUSTIFY">Mini SQL, or mSQL as is it often called, is a light weight relational database management system.  It has been designed to provide rapid access to data sets with as little system overhead as possible.  The system itself is comprised of a database server and various tools that allow a user or a client application to communicate with the server.</P>
  <P ALIGN="JUSTIFY">Although mSQL uses the Structured Query Language (SQL) as its query language, it does not provide a complete implementation of the ANSI standard SQL.  Several features of SQL that are found in more recent versions of the ANSI standard and in more sophisticated database systems are not provided by mSQL.  The incorporation of such features would be in conflict with the basic concept of mSQL (i.e. a Mini database system) and would also increase the load and system requirements needed to run the software.</P>
  <P ALIGN="JUSTIFY">The philosophy of mSQL has been to provide a database management system capable of rapidly handling simple tasks.  It has not been developed for use in critical financial environments (banking applications for example).  The software is capable of performing the supported operations with exceptional speed whilst utilising very few system resources.  Some database systems require high-end hardware platforms and vast quantities of memory before they can provide rapid access to stored data.  mSQL has been designed to provide exceptional data access performance on &quot;small hardware&quot; platforms (such as PC class hardware).  Because of these characteristics, mSQL is well suited to the vast majority of data management tasks.</P>
! <P ALIGN="JUSTIFY">Although the mSQL software distribution is made available over the Internet (and other mechanisms) it is not public domain software or FreeWare.  mSQL is a commercial, supported software package developed by Hughes Technologies Pty Ltd in Australia.  Use of this software in any commercial environment requires the purchase of a commercial use license from Hughes Technologies.  Free licenses are provided to organisations such as Universities, schools and registered charities in an attempt to maintain the ethos of the original Internet.  For more information on purchasing a license or determining whether you qualify for a free license, please see the Hughes Technologies World Wide Web site at </FONT><A HREF="http://Hughes.com.au/"><FONT SIZE=2>http://Hughes.com.au/</FONT></A><FONT SIZE=2>.</P>
  <P ALIGN="JUSTIFY">Development of mSQL and its associated tools is an ongoing project.  Current releases of the mSQL package and applications that use mSQL are always available from the Hughes Technologies web site.  If you require product support, a new version of the software, or some ideas about using mSQL then please visit our web site.</P></DIR>
  </DIR>
  </DIR>
--- 127,133 ----
  </B></FONT><FONT SIZE=2><P ALIGN="JUSTIFY">Mini SQL, or mSQL as is it often called, is a light weight relational database management system.  It has been designed to provide rapid access to data sets with as little system overhead as possible.  The system itself is comprised of a database server and various tools that allow a user or a client application to communicate with the server.</P>
  <P ALIGN="JUSTIFY">Although mSQL uses the Structured Query Language (SQL) as its query language, it does not provide a complete implementation of the ANSI standard SQL.  Several features of SQL that are found in more recent versions of the ANSI standard and in more sophisticated database systems are not provided by mSQL.  The incorporation of such features would be in conflict with the basic concept of mSQL (i.e. a Mini database system) and would also increase the load and system requirements needed to run the software.</P>
  <P ALIGN="JUSTIFY">The philosophy of mSQL has been to provide a database management system capable of rapidly handling simple tasks.  It has not been developed for use in critical financial environments (banking applications for example).  The software is capable of performing the supported operations with exceptional speed whilst utilising very few system resources.  Some database systems require high-end hardware platforms and vast quantities of memory before they can provide rapid access to stored data.  mSQL has been designed to provide exceptional data access performance on &quot;small hardware&quot; platforms (such as PC class hardware).  Because of these characteristics, mSQL is well suited to the vast majority of data management tasks.</P>
! <P ALIGN="JUSTIFY">Although the mSQL software distribution is made available over the Internet (and other mechanisms) it is not public domain software or FreeWare.  mSQL is a commercial, supported software package developed by Hughes Technologies Pty Ltd in Australia.  Use of this software in any commercial environment requires the purchase of a commercial use license from Hughes Technologies.  Free licenses are provided to organisations such as Universities, schools and registered charities in an attempt to maintain the ethos of the original Internet.  For more information on purchasing a license or determining whether you qualify for a free license, please see the Hughes Technologies World Wide Web site at </FONT><A HREF="http://www.Hughes.com.au/"><FONT SIZE=2>http://www.Hughes.com.au/</FONT></A><FONT SIZE=2>.</P>
  <P ALIGN="JUSTIFY">Development of mSQL and its associated tools is an ongoing project.  Current releases of the mSQL package and applications that use mSQL are always available from the Hughes Technologies web site.  If you require product support, a new version of the software, or some ideas about using mSQL then please visit our web site.</P></DIR>
  </DIR>
  </DIR>
*** ./src/conf/site.mm.in	Sat Jul 26 05:49:59 1997
--- ../msql-2.0.3/./src/conf/site.mm.in	Mon Apr 13 15:45:17 1998
***************
*** 4,13 ****
  
  
  COMPILER= @CC@
! INST_DIR= /usr/local/Hughes
  HAVE_DYNAMIC= -DHAVE_DYNAMIC
! CC_ONLY_FLAGS=
! LINK_ONLY_FLAGS=
  
  
  #
--- 4,15 ----
  
  
  COMPILER= @CC@
! INST_DIR= /usr/freeware/msql
  HAVE_DYNAMIC= -DHAVE_DYNAMIC
! CC_ONLY_FLAGS=  -n32 -O3 -mips3  -nostdinc  -woff 1110,1116,1117,1155,1164,1177,1178,1183  -OPT:Olimit=0 
! LINK_ONLY_FLAGS= -n32 -mips3 -nostdlib -s
! MAKE=make
! SHELL=/bin/sh
  
  
  #
***************
*** 31,37 ****
  WORKING_RLIMIT= @WORKING_RLIMIT@
  
  # Extra libraries if required
! EXTRA_LIB= @LIBS@
  
  # Any other CFlags required
  EXTRA_CFLAGS= @DEFS@ $(SSIZE_T) $(U_INT) $(BITTYPES)
--- 33,39 ----
  WORKING_RLIMIT= @WORKING_RLIMIT@
  
  # Extra libraries if required
! #EXTRA_LIB= @LIBS@
  
  # Any other CFlags required
  EXTRA_CFLAGS= @DEFS@ $(SSIZE_T) $(U_INT) $(BITTYPES)
***************
*** 39,43 ****
  # Directory for pid file
  PID_DIR= @PID_DIR@
  
! CFLAGS= -O -I$(TOP)/ $(EXTRA_CFLAGS)
! LDLIBS= -L$(TOP)/lib $(EXTRA_LIB)
--- 41,45 ----
  # Directory for pid file
  PID_DIR= @PID_DIR@
  
! CFLAGS= -I$(ROOT)/usr/include -I$(TOP) $(EXTRA_CFLAGS)
! LDLIBS= -L$(TOP)/regexp -L$(TOP)/msql -L$(TOP)/lib  -L$(ROOT)/usr/lib32 -I$(ROOT)/usr/include -I$(TOP) $(EXTRA_LIB)
*** ./src/lite/lite_lex.c	Wed Sep 24 05:47:08 1997
--- ../msql-2.0.3/./src/lite/lite_lex.c	Sun Apr 12 17:43:05 1998
***************
*** 78,84 ****
  ** Debugging macros.
  */
  
! /* #define DEBUG_STATE	/* Define this to watch the state transitions */
  
  #ifdef LEX_DEBUG
  #  define token(x)	(int) "x"
--- 78,87 ----
  ** Debugging macros.
  */
  
! /*
! #define DEBUG_STATE	
! */
! /* Define this to watch the state transitions */
  
  #ifdef LEX_DEBUG
  #  define token(x)	(int) "x"
*** ./src/msql/msqld.c	Wed Sep 24 07:11:35 1997
--- ../msql-2.0.3/./src/msql/msqld.c	Sun Apr 12 19:23:07 1998
***************
*** 643,649 ****
  
  	if (*confFile == 0)
  	{
! 		snprintf(confFile,sizeof(confFile),"%s/msql.conf", INST_DIR);
  	}
  	printf("\tLoading configuration from '%s'.\n",confFile);
  	msqlLoadConfigFile(confFile);
--- 643,649 ----
  
  	if (*confFile == 0)
  	{
! 		snprintf(confFile,sizeof(confFile),"%s/etc/msql.conf", INST_DIR);
  	}
  	printf("\tLoading configuration from '%s'.\n",confFile);
  	msqlLoadConfigFile(confFile);
*** ./src/msql/msqladmin.c	Mon Jul 14 20:34:04 1997
--- ../msql-2.0.3/./src/msql/msqladmin.c	Sun Apr 12 19:22:46 1998
***************
*** 339,345 ****
  		printf("\tTarget platform \t%s\n\n",TARGET);
  
  		printf("Configuration Details :-\n\n");
! 		printf("\tDefault config file\t%s/msql.conf\n",INST_DIR);
  		printf("\tTCP socket         \t%d\n", 
  			msqlGetIntConf("general", "tcp_port"));
  		printf("\tUNIX socket        \t%s\n", 
--- 339,345 ----
  		printf("\tTarget platform \t%s\n\n",TARGET);
  
  		printf("Configuration Details :-\n\n");
! 		printf("\tDefault config file\t%s/etc/msql.conf\n",INST_DIR);
  		printf("\tTCP socket         \t%d\n", 
  			msqlGetIntConf("general", "tcp_port"));
  		printf("\tUNIX socket        \t%s\n", 
*** ./src/msql/config.c	Sun Sep 14 00:06:34 1997
--- ../msql-2.0.3/./src/msql/config.c	Sun Apr 12 19:22:10 1998
***************
*** 324,330 ****
  	}
  	else
  	{
! 		snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR);
  		fp = fopen(buf,"r");
  	}
  	if (!fp)
--- 324,330 ----
  	}
  	else
  	{
! 		snprintf(buf,sizeof(buf),"%s/etc/msql.conf", INST_DIR);
  		fp = fopen(buf,"r");
  	}
  	if (!fp)
*** ./src/tests/rtest	Sun Sep 21 04:13:32 1997
--- ../msql-2.0.3/./src/tests/rtest	Fri Apr 17 09:23:45 1998
***************
*** 37,46 ****
  #
  # Where are the programs we need
  #
  #MSQLADMIN="/usr/local/Hughes/bin/msqladmin"
! MSQLADMIN="../../msql/msqladmin"
! MSQL="/usr/local/Hughes/bin/msql $MSQLHOST"
! #MSQL="../../msql/msql"
  
  #
  # How can we echo without a newline?
--- 37,48 ----
  #
  # Where are the programs we need
  #
+ MSQL_HOME=/usr/freeware/msql
+ MSQLADMIN="$MSQL_HOME/bin/msqladmin"
+ MSQL="$MSQL_HOME/bin/msql $MSQLHOST"
+ 
  #MSQLADMIN="/usr/local/Hughes/bin/msqladmin"
! #MSQL="/usr/local/Hughes/bin/msql $MSQLHOST"
  
  #
  # How can we echo without a newline?
*** ./src/tests/cachetest	Sun Apr  6 01:55:39 1997
--- ../msql-2.0.3/./src/tests/cachetest	Fri Apr 17 09:24:04 1998
***************
*** 99,102 ****
  		echo "select * from test9 \p\g"
  		COUNT=`expr $COUNT + 1`
  	done
! ) | ../msql/msql $DB
--- 99,102 ----
  		echo "select * from test9 \p\g"
  		COUNT=`expr $COUNT + 1`
  	done
! ) | ../bin/msql $DB
*** ./src/tests/killer	Sun Sep 21 04:49:43 1997
--- ../msql-2.0.3/./src/tests/killer	Fri Apr 17 09:22:40 1998
***************
*** 20,27 ****
  DROP="drop table test"
  DELETE="delete from test"
  
! TMP_FILE="/tmp/msql_test.out"
! RES_FILE="./msql.times"
  
  DB=$1
  NUM_TESTS=2
--- 20,28 ----
  DROP="drop table test"
  DELETE="delete from test"
  
! MSQL_HOME=/usr/freeware/msql
! TMP_FILE="$MSQL_HOME/tests/msql_test.out"
! RES_FILE="$MSQL_HOME/tests/msql.times"
  
  DB=$1
  NUM_TESTS=2
***************
*** 29,42 ****
  NUM_SELECTS=25000
  SEQ_SELECTS=2000
  
! CALC="bc -l"
! PID_FILE="/var/adm/msqld.pid"
  
  #MSQL_HOST="-h fawn"
  
! MSQL="../msql/msql $MSQL_HOST"
  #MSQL="/usr/local/Hughes/bin/msql $MSQL_HOST"
- MSQL_ADMIN="../msql/msqladmin $MSQL_HOST"
  #MSQL_ADMIN="/usr/local/Hughes/bin/msqladmin $MSQL_HOST"
  
  PROFILE="N"
--- 30,44 ----
  NUM_SELECTS=25000
  SEQ_SELECTS=2000
  
! CALC="/usr/bin/bc -l"
! PID_FILE="$MSQL_HOME/msql2d.pid"
  
  #MSQL_HOST="-h fawn"
  
! MSQL="$MSQL_HOME/bin/msql $MSQL_HOST"
! MSQL_ADMIN="$MSQL_HOME/bin/msqladmin $MSQL_HOST"
! 
  #MSQL="/usr/local/Hughes/bin/msql $MSQL_HOST"
  #MSQL_ADMIN="/usr/local/Hughes/bin/msqladmin $MSQL_HOST"
  
  PROFILE="N"
***************
*** 124,130 ****
  then
  	kill -INT `cat $PID_FILE`
  	sleep 1
! 	../msql/msqld&
  	sleep 1
  fi
  echo "Inserting $NUM_INSERTS rows into new keyed table gave :-" >> $RES_FILE
--- 126,132 ----
  then
  	kill -INT `cat $PID_FILE`
  	sleep 1
! 	$MSQL_HOME/bin/msql2d&
  	sleep 1
  fi
  echo "Inserting $NUM_INSERTS rows into new keyed table gave :-" >> $RES_FILE
***************
*** 136,142 ****
  	echo "$CREATE_TABLE \p\g" | ($MSQL $DB > /dev/null)
  	echo "$CREATE_INDEX \p\g" | ($MSQL $DB > /dev/null)
  	echo "Inserting $NUM_INSERTS rows into keyed table"
! 	$BIN_TIME ../msql/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE 3>/dev/tty
  	if test $? -ne 0
  	then
  		echo
--- 138,144 ----
  	echo "$CREATE_TABLE \p\g" | ($MSQL $DB > /dev/null)
  	echo "$CREATE_INDEX \p\g" | ($MSQL $DB > /dev/null)
  	echo "Inserting $NUM_INSERTS rows into keyed table"
! 	$BIN_TIME $MSQL_HOME/tests/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE 3>/dev/tty
  	if test $? -ne 0
  	then
  		echo
***************
*** 163,169 ****
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof ../msql/msqld | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
--- 165,171 ----
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof $MSQL_HOME/bin/msql2d | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
***************
*** 181,187 ****
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	../msql/msqld&
  	sleep 1
  fi
  echo "Filling a deleted keyed table with $NUM_INSERTS rows gave :-" >> $RES_FILE
--- 183,189 ----
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	$MSQL_HOME/bin/msql2d&
  	sleep 1
  fi
  echo "Filling a deleted keyed table with $NUM_INSERTS rows gave :-" >> $RES_FILE
***************
*** 190,196 ****
  	echo "Deleting contents of keyed table"
  	echo "$DELETE \p\g" | ($MSQL $DB > /dev/null)
  	echo "Filling data holes with $NUM_INSERTS inserts."
! 	$BIN_TIME ../msql/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
--- 192,198 ----
  	echo "Deleting contents of keyed table"
  	echo "$DELETE \p\g" | ($MSQL $DB > /dev/null)
  	echo "Filling data holes with $NUM_INSERTS inserts."
! 	$BIN_TIME $MSQL_HOME/tests/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
***************
*** 217,223 ****
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof ../msql/msqld | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
--- 219,225 ----
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof $MSQL_HOME/bin/msql2d | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
***************
*** 238,244 ****
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	../msql/msqld&
  	sleep 1
  fi
  echo "Selecting $NUM_SELECTS rows using primary key :-" >> $RES_FILE
--- 240,246 ----
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	$MSQL_HOME/bin/msql2d&
  	sleep 1
  fi
  echo "Selecting $NUM_SELECTS rows using primary key :-" >> $RES_FILE
***************
*** 245,251 ****
  while test $COUNT -lt $NUM_TESTS
  do
  	echo "Selecting $NUM_SELECTS rows from a keyed table"
! 	$BIN_TIME ../msql/select_test $MSQL_HOST $DB $NUM_SELECTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
--- 247,253 ----
  while test $COUNT -lt $NUM_TESTS
  do
  	echo "Selecting $NUM_SELECTS rows from a keyed table"
! 	$BIN_TIME $MSQL_HOME/tests/select_test $MSQL_HOST $DB $NUM_SELECTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
***************
*** 272,278 ****
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof ../msql/msqld | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
--- 274,280 ----
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof $MSQL_HOME/bin/msql2d | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
***************
*** 293,299 ****
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	../msql/msqld&
  	sleep 1
  fi
  echo "Inserting $NUM_INSERTS rows into new flat table gave :-" >> $RES_FILE
--- 295,301 ----
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	$MSQL_HOME/bin/msql2d&
  	sleep 1
  fi
  echo "Inserting $NUM_INSERTS rows into new flat table gave :-" >> $RES_FILE
***************
*** 304,310 ****
  	echo "Creating flat table"
  	echo "$CREATE_TABLE \p\g" | ($MSQL $DB > /dev/null)
  	echo "Inserting $NUM_INSERTS rows into flat table"
! 	$BIN_TIME ../msql/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
--- 306,312 ----
  	echo "Creating flat table"
  	echo "$CREATE_TABLE \p\g" | ($MSQL $DB > /dev/null)
  	echo "Inserting $NUM_INSERTS rows into flat table"
! 	$BIN_TIME $MSQL_HOME/tests/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
***************
*** 331,337 ****
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof ../msql/msqld | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
--- 333,339 ----
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof $MSQL_HOME/bin/msql2d | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
***************
*** 349,355 ****
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	../msql/msqld&
  	sleep 1
  fi
  echo "Filling a deleted flat table with $NUM_INSERTS rows gave :-" >> $RES_FILE
--- 351,357 ----
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	$MSQL_HOME/bin/msql2d&
  	sleep 1
  fi
  echo "Filling a deleted flat table with $NUM_INSERTS rows gave :-" >> $RES_FILE
***************
*** 358,364 ****
  	echo "Deleting contents of flat table"
  	echo "$DELETE \p\g" | ($MSQL $DB > /dev/null)
  	echo "Filling data holes with $NUM_INSERTS inserts."
! 	$BIN_TIME ../msql/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
--- 360,366 ----
  	echo "Deleting contents of flat table"
  	echo "$DELETE \p\g" | ($MSQL $DB > /dev/null)
  	echo "Filling data holes with $NUM_INSERTS inserts."
! 	$BIN_TIME $MSQL_HOME/tests/insert_test $MSQL_HOST $DB $NUM_INSERTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
***************
*** 385,391 ****
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof ../msql/msqld | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
--- 387,393 ----
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof $MSQL_HOME/bin/msql2d | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
***************
*** 404,410 ****
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	../msql/msqld&
  	sleep 1
  fi
  echo "Selecting $SEQ_SELECTS rows without a key :-" >> $RES_FILE
--- 406,412 ----
  TOTAL=0
  if test "$PROFILE." = "Y."
  then
! 	$MSQL_HOME/bin/msql2d&
  	sleep 1
  fi
  echo "Selecting $SEQ_SELECTS rows without a key :-" >> $RES_FILE
***************
*** 411,417 ****
  while test $COUNT -lt $NUM_TESTS
  do
  	echo "Selecting $SEQ_SELECTS rows from a flat table"
! 	$BIN_TIME ../msql/select_test $MSQL_HOST $DB $SEQ_SELECTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
--- 413,419 ----
  while test $COUNT -lt $NUM_TESTS
  do
  	echo "Selecting $SEQ_SELECTS rows from a flat table"
! 	$BIN_TIME $MSQL_HOME/tests/select_test $MSQL_HOST $DB $SEQ_SELECTS 2> $TMP_FILE
  	if test $? -ne 0
  	then
  		echo
***************
*** 438,444 ****
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof ../msql/msqld | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
--- 440,446 ----
  	sleep 1
  	echo >> $RES_FILE
  	echo >> $RES_FILE
! 	prof $MSQL_HOME/bin/msql2d | head -10 >> $RES_FILE
  fi
  
  echo >> $RES_FILE
*** ./src/w3-msql/auth.c	Sat Aug 16 22:44:40 1997
--- ../msql-2.0.3/./src/w3-msql/auth.c	Sat Apr  4 15:09:26 1998
***************
*** 376,382 ****
  	/*
  	** Get everything we might need organised
  	*/
! 	authHost = msqlGetCharConf("w3-msql","auth_host");
  	sock = msqlConnect(authHost);
  	if (sock < 0)
  	{
--- 376,382 ----
  	/*
  	** Get everything we might need organised
  	*/
! 	authHost = (char *)msqlGetCharConf("w3-msql","auth_host");
  	sock = msqlConnect(authHost);
  	if (sock < 0)
  	{
*** ./src/w3-msql/lexer.c	Sat Aug 16 22:44:40 1997
--- ../msql-2.0.3/./src/w3-msql/lexer.c	Sun Apr 12 17:46:48 1998
***************
*** 79,85 ****
  ** Debugging macros.
  */
  
! /* #define DEBUG_STATE	/* Define this to watch the state transitions */
  
  #ifdef LEX_DEBUG
  #  define token(x)	(int) "x"
--- 79,88 ----
  ** Debugging macros.
  */
  
! /*
! #define DEBUG_STATE	
! */
! /* Define this to watch the state transitions */
  
  #ifdef LEX_DEBUG
  #  define token(x)	(int) "x"
*** ./misc/setup_w3auth	Tue Oct  7 14:39:01 1997
--- ../msql-2.0.3/./misc/setup_w3auth	Mon Apr 13 16:39:47 1998
***************
*** 1,4 ****
! #!/usr/local/Hughes/bin/lite
  
  
  /*
--- 1,4 ----
! #!/usr/freeware/msql/bin/lite
  
  
  /*
***************
*** 15,21 ****
  */
  
  echo ("Creating the empty database ...");
! if (system("/usr/local/Hughes/bin/msqladmin create w3-msql") != 0)
  {
  	fatal("\nError :  creating databases");
  	exit(1);
--- 15,21 ----
  */
  
  echo ("Creating the empty database ...");
! if (system("/usr/freeware/msql/bin/msqladmin create w3-msql") != 0)
  {
  	fatal("\nError :  creating databases");
  	exit(1);
*** ./misc/msql.conf	Sun Jul  6 22:44:29 1997
--- ../msql-2.0.3/./misc/msql.conf	Mon Apr 13 16:38:09 1998
***************
*** 17,23 ****
  
  [general]
  
! Inst_Dir = _INST_
  mSQL_User = msql
  Admin_User = root
  Pid_File = %I/msql2d.pid
--- 17,23 ----
  
  [general]
  
! #Inst_Dir = _INST_
  mSQL_User = msql
  Admin_User = root
  Pid_File = %I/msql2d.pid
*** ./scripts/sys-arch	Sun Jan  5 14:13:14 1997
--- ../msql-2.0.3/./scripts/sys-arch	Sat Apr  4 13:25:22 1998
***************
*** 49,52 ****
  	rev="$maj.$min"
  fi
  
! echo "${os}-${rev}-${machine}" | sed 's/ /_/g'
--- 49,56 ----
  	rev="$maj.$min"
  fi
  
! if test "$os" = "IRIX" || test "$os" = "IRIX64" 
! 	then echo "IRIX"
! else 
! 	echo "${os}-${rev}-${machine}" | sed 's/ /_/g' 
! fi
*** ./scripts/make-target	Sun Jan  5 14:13:14 1997
--- ../msql-2.0.3/./scripts/make-target	Sat Apr  4 13:46:40 1998
***************
*** 23,40 ****
  TARG=`scripts/sys-arch` 
  if test -d targets/${TARG}
  then 
! 	${ECHO_N} "Target directory for ${TARG} exists! ${ECHO_C}"
! 	${ECHO_N} "Clear it? [y/n] ${ECHO_C} "
! 	read ANS 
! 	if test ${ANS}"." = "y." 
! 	then 
! 		echo "Clearing old target directory for ${TARG}" 
! 		rm -rf targets/${TARG}
! 	else 
! 		echo 
! 		echo "OK. I'll fill the gaps (there will be warnings)"
! 		echo 
! 	fi
  fi
  
  
--- 23,30 ----
  TARG=`scripts/sys-arch` 
  if test -d targets/${TARG}
  then 
! 	echo "Targets exists ... Exiting"
! 	exit
  fi
  
  
*** ./Makefile	Sun Jan  5 14:11:42 1997
--- ../msql-2.0.3/./Makefile	Mon Apr  6 05:16:21 1998
***************
*** 17,26 ****
  
  SHELL=/bin/sh
  
! all:
! 	@ echo ""; echo "You have not read the installation procedures.";\
! 	echo "Please read the README file for build instructions.";\
! 	echo
  
  target:
  	@ scripts/make-target
--- 17,23 ----
  
  SHELL=/bin/sh
  
! all: target setup compile
  
  target:
  	@ scripts/make-target
***************
*** 39,41 ****
--- 36,52 ----
  	done ;\
  	tar -cvf $$TAR_FILE -I /tmp/dist.files ;\
  	echo; echo "Archive of full distribution complete"
+ 
+ 
+ #Added for SGI Freeware builds
+ setup:
+ 	cd targets/IRIX ; ./setup 
+ 
+ compile:
+ 	cd ./targets/IRIX; make all
+ 
+ clean:
+ 	rm -rf targets/IRIX
+ 
+ install:
+ 	cd ./targets/IRIX; make install