diff -rc gnusql-0.7b6.0/ChangeLog gnusql-0.7b6.1/ChangeLog *** gnusql-0.7b6.0/ChangeLog Mon Sep 28 21:38:33 1998 --- gnusql-0.7b6.1/ChangeLog Tue Sep 29 22:43:22 1998 *************** *** 1,3 **** --- 1,14 ---- + Wed Sep 30 02:39:48 1998 Michael Kimelman + + * *.c : copyright years & some stylystic changes + + * etc/make-util.in, Makefile.in: distclean process fixed + + Tue Sep 29 22:23:52 1998 Michael Kimelman + + * src/trl/vcblib.c, src/trl/trl_dump.c, src/synthes/synlib.c, src/synthes/optim.c, src/synthes/codegen.c, src/semantic/binding.k, src/other/vmemory.c, src/other/xmem.c, src/other/type_lib.c, src/other/cl_lib.c, src/other/conn_handler.c, src/main/dyn_funcs.c, src/kitty/node.c, src/interpr/interpr.c, src/interpr/intlib.c, src/engine/trans/inscon.c, src/engine/trans/orddel.c, src/engine/trans/ind_scan.c, src/engine/synch/snipc.c, src/engine/trans/aggravg.c, src/engine/rcvutl/strgcr.c, src/engine/jour/ljipc.c, src/engine/jour/microj.c, src/engine/buf/buf.c, src/engine/buf/bufipc.c, src/comp-lib/copy.c: + make SGI compiler happy about {} around 'else' + Tue Sep 29 00:39:43 1998 Michael Kimelman * version 0.7b6.0 issued. diff -rc gnusql-0.7b6.0/INSTALL gnusql-0.7b6.1/INSTALL *** gnusql-0.7b6.0/INSTALL Mon Jan 19 01:14:15 1998 --- gnusql-0.7b6.1/INSTALL Tue Sep 29 17:18:50 1998 *************** *** 1,5 **** GNU SQL Server Installation Guide ! Copyright (c) 1996 Free Software Foundation, Inc Developed at Institute for System Programming of Russian Academy of Science Permission is granted to anyone to make or distribute verbatim copies --- 1,5 ---- GNU SQL Server Installation Guide ! Copyright (c) 1996-1998, Free Software Foundation, Inc Developed at Institute for System Programming of Russian Academy of Science Permission is granted to anyone to make or distribute verbatim copies diff -rc gnusql-0.7b6.0/Makefile.in gnusql-0.7b6.1/Makefile.in *** gnusql-0.7b6.0/Makefile.in Sun Sep 27 17:32:35 1998 --- gnusql-0.7b6.1/Makefile.in Tue Sep 29 21:58:33 1998 *************** *** 1,11 **** ############################################################## ## GNU SQL Server ## ############################################################## ! ## $Id: Makefile.in,v 1.253 1998/09/27 21:32:35 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 1,11 ---- ############################################################## ## GNU SQL Server ## ############################################################## ! ## $Id: Makefile.in,v 1.255 1998/09/30 01:58:33 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## *************** *** 120,131 **** "$(mandir)" "$(infodir)" "$(prefix)" localclean: - $(RM) *.cache *.log *.status - clean: - $(RM) -r sqlser lib $(builddir)/etc/make-util clean "$(MAKECLEAN)" distclean: localclean - $(RM) src/include/config.h - - $(RM) -r sqlser lib $(builddir)/etc/make-util clean "$(MAKERT) distclean" $(SHELL) $(srcdir)/etc/conf-templ clean - $(RM) Makefile *.stamp etc/make-util --- 120,130 ---- "$(mandir)" "$(infodir)" "$(prefix)" localclean: - $(RM) *.cache *.log *.status - $(RM) -r sqlser lib + clean: localclean $(builddir)/etc/make-util clean "$(MAKECLEAN)" distclean: localclean - $(RM) src/include/config.h $(builddir)/etc/make-util clean "$(MAKERT) distclean" $(SHELL) $(srcdir)/etc/conf-templ clean - $(RM) Makefile *.stamp etc/make-util diff -rc gnusql-0.7b6.0/PROBLEMS gnusql-0.7b6.1/PROBLEMS *** gnusql-0.7b6.0/PROBLEMS Wed May 20 02:00:23 1998 --- gnusql-0.7b6.1/PROBLEMS Tue Sep 29 16:26:01 1998 *************** *** 57,75 **** I tried to make a gcc for the m68k that aligns to 4 bytes but then gsqsls core dumped faster that you could type it in. - 13. I've defined a cursor - - SELECT OWNER,TABNAME,UNTABID - FROM DEFINITION_SCHEMA.SYSTABLES - ORDER BY OWNER,TABNAME; - - Due to the ORDER BY I get a SERVER CRASH during compilation -- !!! brackets - cure it. - (SELECT OWNER,TABNAME,UNTABID - FROM DEFINITION_SCHEMA.SYSTABLES - ) - ORDER BY OWNER,TABNAME; - - 14. etc/dq is not configured right 15. --- 57,61 ---- diff -rc gnusql-0.7b6.0/README gnusql-0.7b6.1/README *** gnusql-0.7b6.0/README Mon Sep 28 21:54:57 1998 --- gnusql-0.7b6.1/README Tue Sep 29 22:45:18 1998 *************** *** 1,4 **** ! This directory tree holds version 0.7b6.0 of GNU SQL Server. This is the beta *test* of the system. You may encounter bugs in this release. If you do, please report --- 1,4 ---- ! This directory tree holds version 0.7b6.1 of GNU SQL Server. This is the beta *test* of the system. You may encounter bugs in this release. If you do, please report diff -rc gnusql-0.7b6.0/configure.in gnusql-0.7b6.1/configure.in *** gnusql-0.7b6.0/configure.in Mon Sep 28 21:33:30 1998 --- gnusql-0.7b6.1/configure.in Tue Sep 29 17:24:40 1998 *************** *** 1,10 **** dnl Process this file with autoconf to produce a configure script. ## ! ## $Id: configure.in,v 1.24 1998/09/29 01:33:30 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 1,10 ---- dnl Process this file with autoconf to produce a configure script. ## ! ## $Id: configure.in,v 1.25 1998/09/29 21:24:40 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## Common subdirectories: gnusql-0.7b6.0/etc and gnusql-0.7b6.1/etc diff -rc gnusql-0.7b6.0/make-dist gnusql-0.7b6.1/make-dist *** gnusql-0.7b6.0/make-dist Sat Sep 12 20:24:06 1998 --- gnusql-0.7b6.1/make-dist Tue Sep 29 17:18:51 1998 *************** *** 7,13 **** # # This file is part of GNU SQL Server. # ! # Copyright (C) 1996, 1997 Free Software Foundation, Inc # Wriiten at Institute for System Programming of Russian Academy of Science # # GNU SQL Server is free software; you can redistribute it and/or modify --- 7,13 ---- # # This file is part of GNU SQL Server. # ! # Copyright (c) 1996-1998, Free Software Foundation, Inc # Wriiten at Institute for System Programming of Russian Academy of Science # # GNU SQL Server is free software; you can redistribute it and/or modify Common subdirectories: gnusql-0.7b6.0/src and gnusql-0.7b6.1/src diff -rc gnusql-0.7b6.0/stamp-h.in gnusql-0.7b6.1/stamp-h.in *** gnusql-0.7b6.0/stamp-h.in Mon Sep 28 21:33:45 1998 --- gnusql-0.7b6.1/stamp-h.in Tue Sep 29 21:26:59 1998 *************** *** 1 **** ! agate Mon Sep 28 21:33:45 EDT 1998 kimelman pts/6 Sep 23 14:19 --- 1 ---- ! agate Tue Sep 29 21:26:58 EDT 1998 kimelman pts/6 Sep 23 14:19 Common subdirectories: gnusql-0.7b6.0/test and gnusql-0.7b6.1/test diff -rc gnusql-0.7b6.0/version gnusql-0.7b6.1/version *** gnusql-0.7b6.0/version Mon Sep 28 21:54:57 1998 --- gnusql-0.7b6.1/version Tue Sep 29 22:45:18 1998 *************** *** 1 **** ! 0.7b6.0 --- 1 ---- ! 0.7b6.1 diff -rc gnusql-0.7b6.0/etc/Makefile.in gnusql-0.7b6.1/etc/Makefile.in *** gnusql-0.7b6.0/etc/Makefile.in Thu May 7 14:35:07 1998 --- gnusql-0.7b6.1/etc/Makefile.in Tue Sep 29 17:24:41 1998 *************** *** 1,8 **** ############################################################################# ## GNU SQL Server (etc directory) ## ############################################################################# ! # $Id: Makefile.in,v 1.5 1998/05/07 18:35:07 kml Exp $ ! # srcdir=@srcdir@ VPATH=@srcdir@ builddir=@builddir@ --- 1,31 ---- ############################################################################# ## GNU SQL Server (etc directory) ## ############################################################################# ! ## $Id: Makefile.in,v 1.6 1998/09/29 21:24:41 kimelman Exp $ ! ## ! ## This file is a part of GNU SQL Server ! ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ! ## Developed at Institute of System Programming of Russian Academy of Science ! ## This file is written by Michael Kimelman ! ## ! ## This program is free software; you can redistribute it and/or modify it under ! ## the terms of the GNU General Public License as published by the Free ! ## Software Foundation; either version 2 of the License, or (at your option) ! ## any later version. ! ## ! ## This program is distributed in the hope that it will be useful, but WITHOUT ! ## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ! ## FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for ! ## more details. ! ## ! ## You should have received a copy of the GNU General Public License along with ! ## this program; if not, write to the Free Software Foundation, Inc., ! ## 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! ## ! ## Contacts: gss@ispras.ru ! ## ! srcdir=@srcdir@ VPATH=@srcdir@ builddir=@builddir@ *************** *** 31,33 **** --- 54,57 ---- ./make-util clean "make clean" distclean : ./make-util clean "make distclean" + .SILENT: Only in gnusql-0.7b6.0/etc: Tdeps diff -rc gnusql-0.7b6.0/etc/Tdeps.in gnusql-0.7b6.1/etc/Tdeps.in *** gnusql-0.7b6.0/etc/Tdeps.in Mon Jan 19 01:14:33 1998 --- gnusql-0.7b6.1/etc/Tdeps.in Tue Sep 29 17:18:52 1998 *************** *** 5,11 **** ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 5,11 ---- ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## Only in gnusql-0.7b6.0/etc: ansi2knr-sh Only in gnusql-0.7b6.0/etc: arc diff -rc gnusql-0.7b6.0/etc/ask.texi gnusql-0.7b6.1/etc/ask.texi *** gnusql-0.7b6.0/etc/ask.texi Mon Jan 19 01:14:33 1998 --- gnusql-0.7b6.1/etc/ask.texi Tue Sep 29 17:18:53 1998 *************** *** 1,5 **** @c This is part of the GNU SQL Server manual. ! @c Copyright (C) 1996, Free Software Foundation, Inc @c See file gss.texi for copying conditions. @node Acknowledgments, Intro, Manifesto, Top @chapter Acknowledgments --- 1,5 ---- @c This is part of the GNU SQL Server manual. ! @c Copyright (c) 1996-1998, Free Software Foundation, Inc @c See file gss.texi for copying conditions. @node Acknowledgments, Intro, Manifesto, Top @chapter Acknowledgments Only in gnusql-0.7b6.0/etc: boot diff -rc gnusql-0.7b6.0/etc/boot.in gnusql-0.7b6.1/etc/boot.in *** gnusql-0.7b6.0/etc/boot.in Tue Sep 15 13:06:42 1998 --- gnusql-0.7b6.1/etc/boot.in Tue Sep 29 17:18:53 1998 *************** *** 6,12 **** # # This file is a part of GNU SQL Server # ! # Copyright (c) 1996, 1997 Free Software Foundation, Inc. # This file is written by Michael Kimelman. # # Contacts: gss@ispras.ru --- 6,12 ---- # # This file is a part of GNU SQL Server # ! # Copyright (c) 1996-1998, Free Software Foundation, Inc. # This file is written by Michael Kimelman. # # Contacts: gss@ispras.ru diff -rc gnusql-0.7b6.0/etc/conf-templ gnusql-0.7b6.1/etc/conf-templ *** gnusql-0.7b6.0/etc/conf-templ Sun May 10 00:20:52 1998 --- gnusql-0.7b6.1/etc/conf-templ Tue Sep 29 17:18:53 1998 *************** *** 7,13 **** # # This file is a part of GNU SQL Server # ! # Copyright (c) 1996, Free Software Foundation, Inc # Developed at the Institute of System Programming # This file is written by Michael Kimelman # --- 7,13 ---- # # This file is a part of GNU SQL Server # ! # Copyright (c) 1996-1998, Free Software Foundation, Inc # Developed at the Institute of System Programming # This file is written by Michael Kimelman # Only in gnusql-0.7b6.0/etc: dq diff -rc gnusql-0.7b6.0/etc/gnu.texi gnusql-0.7b6.1/etc/gnu.texi *** gnusql-0.7b6.0/etc/gnu.texi Mon Jan 19 01:14:34 1998 --- gnusql-0.7b6.1/etc/gnu.texi Tue Sep 29 17:18:54 1998 *************** *** 1,6 **** @c This is part of the GNU SQL Server manual. @c ! @c Copyright (c) 1996, Free Software Foundation, Inc @c Made at the Institute of System Programming @c This file is written by Michael Kimelman @c --- 1,6 ---- @c This is part of the GNU SQL Server manual. @c ! @c Copyright (c) 1996-1998, Free Software Foundation, Inc @c Made at the Institute of System Programming @c This file is written by Michael Kimelman @c diff -rc gnusql-0.7b6.0/etc/gss.texi gnusql-0.7b6.1/etc/gss.texi *** gnusql-0.7b6.0/etc/gss.texi Mon Jan 19 01:14:34 1998 --- gnusql-0.7b6.1/etc/gss.texi Tue Sep 29 17:18:54 1998 *************** *** 6,12 **** for GNU SQL Server version 0.7. @c Please REMEMBER to update edition number in *three* places in this file. ! Copyright (C) 1996 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice --- 6,12 ---- for GNU SQL Server version 0.7. @c Please REMEMBER to update edition number in *three* places in this file. ! Copyright (c) 1996-1998, Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice diff -rc gnusql-0.7b6.0/etc/make-util.in gnusql-0.7b6.1/etc/make-util.in *** gnusql-0.7b6.0/etc/make-util.in Mon Sep 28 20:39:34 1998 --- gnusql-0.7b6.1/etc/make-util.in Tue Sep 29 21:58:41 1998 *************** *** 3,13 **** # it's primary aim is to do make-back - delete # all files generated by previous make invocation. # ! # $Id: make-util.in,v 1.5 1998/09/29 00:39:34 kimelman Exp $ # # This file is a part of GNU SQL Server # ! # Copyright (c) 1996, 1997 Free Software Foundation, Inc # Developed at the Institute of System Programming # This file is written by Michael Kimelman # --- 3,13 ---- # it's primary aim is to do make-back - delete # all files generated by previous make invocation. # ! # $Id: make-util.in,v 1.7 1998/09/30 01:58:41 kimelman Exp $ # # This file is a part of GNU SQL Server # ! # Copyright (c) 1996-1998, Free Software Foundation, Inc # Developed at the Institute of System Programming # This file is written by Michael Kimelman # *************** *** 88,97 **** else MAKECLEAN="$*" fi ! DISTCLEAN=`expr "$MAKECLAN" : '.*\(distclean\).*'` ## cleanning subdirectories from the deepest level to '.' for dir in `find . -type d -depth -print ` ; do if [ $dir = . ]; then continue; fi if [ -r $dir/Makefile -o -r $dir/makefile ]; then ( cd $dir; ${MAKECLEAN} ); ## it can invoke that code recursively else --- 88,102 ---- else MAKECLEAN="$*" fi ! DISTCLEAN=`expr "$MAKECLEAN" : '.*\(distclean\).*'` ! # echo "___> `pwd` : $DISTCLEAN " ! ## cleanning subdirectories from the deepest level to '.' for dir in `find . -type d -depth -print ` ; do if [ $dir = . ]; then continue; fi + if [ `dirname $dir` != . ]; then continue ; fi + if [ `basename $dir` = "CVS" ]; then continue ; fi + if [ `basename $dir` = "RCS" ]; then continue ; fi if [ -r $dir/Makefile -o -r $dir/makefile ]; then ( cd $dir; ${MAKECLEAN} ); ## it can invoke that code recursively else *************** *** 133,142 **** fi if [ "$DISTCLEAN" ] ; then ## clean configurable files. ! echo "Cleaning configurables..." ! for fn in xxx.in `ls *.in 2>/dev/null` ; do f1=`basename $fn .in` ! if [ -f $f1 -a $f1 != "Makefile" -a $f1 != "Makefile_h" -a $f1 != "configure" -a \ $f1 != "config.h" -a $f1 != "stamp-h" -a $f1 != "make-util" ]; then rm -f $f1 fi --- 138,147 ---- fi if [ "$DISTCLEAN" ] ; then ## clean configurable files. ! # echo "Cleaning configurables..." ! for fn in `ls *.in 2>/dev/null` ; do f1=`basename $fn .in` ! if [ -f $f1 -a $f1 != "configure" -a \ $f1 != "config.h" -a $f1 != "stamp-h" -a $f1 != "make-util" ]; then rm -f $f1 fi *************** *** 145,150 **** --- 150,156 ---- fi done fi + # echo "<___ `pwd` : $DISTCLEAN " ;; *) Only in gnusql-0.7b6.0/etc: move-if-change Only in gnusql-0.7b6.0/etc: preserve Only in gnusql-0.7b6.0/etc: rpcgen-sh diff -rc gnusql-0.7b6.0/src/Makefile.in gnusql-0.7b6.1/src/Makefile.in *** gnusql-0.7b6.0/src/Makefile.in Wed Jul 29 23:23:34 1998 --- gnusql-0.7b6.1/src/Makefile.in Tue Sep 29 17:24:46 1998 *************** *** 2,12 **** ## GNU SQL Compiler ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.250 1998/07/30 03:23:34 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.251 1998/09/29 21:24:46 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/Makefile_h.in gnusql-0.7b6.1/src/Makefile_h.in *** gnusql-0.7b6.0/src/Makefile_h.in Tue Jan 20 00:14:47 1998 --- gnusql-0.7b6.1/src/Makefile_h.in Tue Sep 29 17:24:46 1998 *************** *** 2,12 **** ## GNU SQL Compiler (common rules and substitutions) ## ############################################################## ## ! ## $Id: Makefile_h.in,v 1.248 1998/01/20 05:14:47 kml Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (common rules and substitutions) ## ############################################################## ## ! ## $Id: Makefile_h.in,v 1.249 1998/09/29 21:24:46 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## Common subdirectories: gnusql-0.7b6.0/src/comp-lib and gnusql-0.7b6.1/src/comp-lib Common subdirectories: gnusql-0.7b6.0/src/engine and gnusql-0.7b6.1/src/engine Common subdirectories: gnusql-0.7b6.0/src/include and gnusql-0.7b6.1/src/include Common subdirectories: gnusql-0.7b6.0/src/interpr and gnusql-0.7b6.1/src/interpr Common subdirectories: gnusql-0.7b6.0/src/kitty and gnusql-0.7b6.1/src/kitty Common subdirectories: gnusql-0.7b6.0/src/main and gnusql-0.7b6.1/src/main Common subdirectories: gnusql-0.7b6.0/src/opt and gnusql-0.7b6.1/src/opt Common subdirectories: gnusql-0.7b6.0/src/other and gnusql-0.7b6.1/src/other Common subdirectories: gnusql-0.7b6.0/src/parse and gnusql-0.7b6.1/src/parse Common subdirectories: gnusql-0.7b6.0/src/semantic and gnusql-0.7b6.1/src/semantic Common subdirectories: gnusql-0.7b6.0/src/synthes and gnusql-0.7b6.1/src/synthes Common subdirectories: gnusql-0.7b6.0/src/trl and gnusql-0.7b6.1/src/trl diff -rc gnusql-0.7b6.0/src/comp-lib/Makefile.in gnusql-0.7b6.1/src/comp-lib/Makefile.in *** gnusql-0.7b6.0/src/comp-lib/Makefile.in Mon Sep 28 02:09:22 1998 --- gnusql-0.7b6.1/src/comp-lib/Makefile.in Tue Sep 29 17:24:47 1998 *************** *** 1,11 **** ##============================================================## ## GNU SQL compiler (engine interface library) ## ##============================================================## ! ## $Id: Makefile.in,v 1.248 1998/09/28 06:03:04 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 1,11 ---- ##============================================================## ## GNU SQL compiler (engine interface library) ## ##============================================================## ! ## $Id: Makefile.in,v 1.249 1998/09/29 21:24:47 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/comp-lib/catfun.c gnusql-0.7b6.1/src/comp-lib/catfun.c *** gnusql-0.7b6.0/src/comp-lib/catfun.c Wed May 20 01:43:19 1998 --- gnusql-0.7b6.1/src/comp-lib/catfun.c Tue Sep 29 17:24:47 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 26,32 **** * */ ! /* $Id: catfun.c,v 1.248 1998/05/20 05:43:19 kml Exp $ */ #include "global.h" #include "type_lib.h" --- 26,32 ---- * */ ! /* $Id: catfun.c,v 1.249 1998/09/29 21:24:47 kimelman Exp $ */ #include "global.h" #include "type_lib.h" diff -rc gnusql-0.7b6.0/src/comp-lib/copy.c gnusql-0.7b6.1/src/comp-lib/copy.c *** gnusql-0.7b6.0/src/comp-lib/copy.c Wed Jul 29 23:23:34 1998 --- gnusql-0.7b6.1/src/comp-lib/copy.c Tue Sep 29 18:23:33 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva, 1994 * Fixed by Kostya Dyshlevoy, 1995 --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva, 1994 * Fixed by Kostya Dyshlevoy, 1995 *************** *** 26,32 **** * */ ! /* $Id: copy.c,v 1.248 1998/07/30 03:23:34 kimelman Exp $ */ #define MAIN #include "global.h" --- 26,32 ---- * */ ! /* $Id: copy.c,v 1.250 1998/09/29 22:23:33 kimelman Exp $ */ #define MAIN #include "global.h" *************** *** 74,79 **** --- 74,81 ---- * all chenges made by it */ + void drop_staistic(void); + i4_t rollback (i4_t cpn) { diff -rc gnusql-0.7b6.0/src/comp-lib/db_cre_cli.c gnusql-0.7b6.1/src/comp-lib/db_cre_cli.c *** gnusql-0.7b6.0/src/comp-lib/db_cre_cli.c Wed Aug 12 18:30:41 1998 --- gnusql-0.7b6.1/src/comp-lib/db_cre_cli.c Tue Sep 29 22:39:01 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: db_cre_cli.c,v 1.246 1998/07/30 03:23:35 kimelman Exp $ */ #include "setup_os.h" #ifdef HAVE_UNISTD_H --- 25,31 ---- * */ ! /* $Id: db_cre_cli.c,v 1.248 1998/09/30 02:39:01 kimelman Exp $ */ #include "setup_os.h" #ifdef HAVE_UNISTD_H *************** *** 39,46 **** * from transaction & dispatcher */ #define TRN_CLIENT_WAIT_TIME 3000 /* time of transaction's waiting * * for client's request */ ! i4_t ! main (i4_t argc, char **argv) { gss_client_t *cli_disp; result_t *int_res; --- 39,46 ---- * from transaction & dispatcher */ #define TRN_CLIENT_WAIT_TIME 3000 /* time of transaction's waiting * * for client's request */ ! int ! main (int argc, char **argv) { gss_client_t *cli_disp; result_t *int_res; diff -rc gnusql-0.7b6.0/src/comp-lib/db_cre_ser.c gnusql-0.7b6.1/src/comp-lib/db_cre_ser.c *** gnusql-0.7b6.0/src/comp-lib/db_cre_ser.c Wed May 20 01:43:19 1998 --- gnusql-0.7b6.1/src/comp-lib/db_cre_ser.c Tue Sep 29 17:24:49 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * *************** *** 25,31 **** * */ ! /* $Id: db_cre_ser.c,v 1.247 1998/05/20 05:43:19 kml Exp $ */ #include "gsqltrn.h" /* c/s protocol defnitions */ #include "global.h" --- 25,31 ---- * */ ! /* $Id: db_cre_ser.c,v 1.248 1998/09/29 21:24:49 kimelman Exp $ */ #include "gsqltrn.h" /* c/s protocol defnitions */ #include "global.h" diff -rc gnusql-0.7b6.0/src/comp-lib/finadm.c gnusql-0.7b6.1/src/comp-lib/finadm.c *** gnusql-0.7b6.0/src/comp-lib/finadm.c Wed Jul 29 23:23:35 1998 --- gnusql-0.7b6.1/src/comp-lib/finadm.c Tue Sep 29 22:39:02 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: finadm.c,v 1.246 1998/07/30 03:23:35 kimelman Exp $ */ #include "setup_os.h" #include "cl_lib.h" --- 25,31 ---- * */ ! /* $Id: finadm.c,v 1.248 1998/09/30 02:39:02 kimelman Exp $ */ #include "setup_os.h" #include "cl_lib.h" *************** *** 35,42 **** #endif #include "dispatch.h" ! i4_t ! main (i4_t argc, char **argv) { gss_client_t *cli_disp; static i4_t int_arg = 0; --- 35,42 ---- #endif #include "dispatch.h" ! int ! main (int argc, char **argv) { gss_client_t *cli_disp; static i4_t int_arg = 0; diff -rc gnusql-0.7b6.0/src/comp-lib/index.h gnusql-0.7b6.1/src/comp-lib/index.h *** gnusql-0.7b6.0/src/comp-lib/index.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/comp-lib/index.h Tue Sep 29 17:24:50 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva * *************** *** 28,34 **** #ifndef __index_h__ #define __index_h__ ! /* $Id: index.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ extern Indid indid1, indid2, --- 28,34 ---- #ifndef __index_h__ #define __index_h__ ! /* $Id: index.h,v 1.246 1998/09/29 21:24:50 kimelman Exp $ */ extern Indid indid1, indid2, diff -rc gnusql-0.7b6.0/src/comp-lib/lib1.c gnusql-0.7b6.1/src/comp-lib/lib1.c *** gnusql-0.7b6.0/src/comp-lib/lib1.c Tue Jan 13 07:18:16 1998 --- gnusql-0.7b6.1/src/comp-lib/lib1.c Tue Sep 29 17:24:51 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * *************** *** 25,31 **** * */ ! /* $Id: lib1.c,v 1.248 1998/01/13 12:18:16 vera Exp $ */ #include "global.h" #ifdef HAVE_UNISTD_H --- 25,31 ---- * */ ! /* $Id: lib1.c,v 1.249 1998/09/29 21:24:51 kimelman Exp $ */ #include "global.h" #ifdef HAVE_UNISTD_H diff -rc gnusql-0.7b6.0/src/comp-lib/libfunc1.c gnusql-0.7b6.1/src/comp-lib/libfunc1.c *** gnusql-0.7b6.0/src/comp-lib/libfunc1.c Thu May 7 14:24:47 1998 --- gnusql-0.7b6.1/src/comp-lib/libfunc1.c Tue Sep 29 17:24:51 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * *************** *** 26,32 **** * */ ! /* $Id: libfunc1.c,v 1.249 1998/05/07 18:24:47 kml Exp $ */ #include "setup_os.h" #ifdef HAVE_UNISTD_H --- 26,32 ---- * */ ! /* $Id: libfunc1.c,v 1.250 1998/09/29 21:24:51 kimelman Exp $ */ #include "setup_os.h" #ifdef HAVE_UNISTD_H diff -rc gnusql-0.7b6.0/src/comp-lib/runadm.c gnusql-0.7b6.1/src/comp-lib/runadm.c *** gnusql-0.7b6.0/src/comp-lib/runadm.c Wed Jul 29 23:23:35 1998 --- gnusql-0.7b6.1/src/comp-lib/runadm.c Tue Sep 29 22:39:02 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: runadm.c,v 1.246 1998/07/30 03:23:35 kimelman Exp $ */ #include "setup_os.h" #include --- 25,31 ---- * */ ! /* $Id: runadm.c,v 1.248 1998/09/30 02:39:02 kimelman Exp $ */ #include "setup_os.h" #include *************** *** 41,47 **** #define CREATE_WAIT_TIME 60 int ! main (i4_t argc, char **argv) { CLIENT *clnt; pid_t pid; --- 41,47 ---- #define CREATE_WAIT_TIME 60 int ! main (int argc, char **argv) { CLIENT *clnt; pid_t pid; diff -rc gnusql-0.7b6.0/src/engine/Makefile.in gnusql-0.7b6.1/src/engine/Makefile.in *** gnusql-0.7b6.0/src/engine/Makefile.in Mon Sep 28 02:09:24 1998 --- gnusql-0.7b6.1/src/engine/Makefile.in Tue Sep 29 17:24:53 1998 *************** *** 8,18 **** ## ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.252 1998/09/28 06:03:05 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 8,18 ---- ## ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.253 1998/09/29 21:24:53 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/engine/adm.c gnusql-0.7b6.1/src/engine/adm.c *** gnusql-0.7b6.0/src/engine/adm.c Sat Aug 22 00:19:18 1998 --- gnusql-0.7b6.1/src/engine/adm.c Tue Sep 29 17:24:55 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: adm.c,v 1.256 1998/08/22 04:15:33 kimelman Exp $ */ #include --- 26,32 ---- * */ ! /* $Id: adm.c,v 1.257 1998/09/29 21:24:55 kimelman Exp $ */ #include *************** *** 171,177 **** sigset_t set; printf ("\n GNU SQL server (version %s on %s)",VERSION,HOST); ! printf ("\n Copyright (c) 1996, 1997 Free Software Foundation, Inc.\n\n"); fix_adm_port(argv[1]); /* argv[1] is adm rpc program identifier */ --- 171,177 ---- sigset_t set; printf ("\n GNU SQL server (version %s on %s)",VERSION,HOST); ! printf ("\n Copyright (c) 1996-1998, Free Software Foundation, Inc.\n\n"); fix_adm_port(argv[1]); /* argv[1] is adm rpc program identifier */ diff -rc gnusql-0.7b6.0/src/engine/admdef.h gnusql-0.7b6.1/src/engine/admdef.h *** gnusql-0.7b6.0/src/engine/admdef.h Thu Jun 5 02:08:27 1997 --- gnusql-0.7b6.1/src/engine/admdef.h Tue Sep 29 17:24:56 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 30,36 **** #ifndef __ADMDEF_H__ #define __ADMDEF_H__ ! /* $Id: admdef.h,v 1.246 1997/06/05 06:08:27 vera Exp $ */ #include --- 30,36 ---- #ifndef __ADMDEF_H__ #define __ADMDEF_H__ ! /* $Id: admdef.h,v 1.247 1998/09/29 21:24:56 kimelman Exp $ */ #include Common subdirectories: gnusql-0.7b6.0/src/engine/buf and gnusql-0.7b6.1/src/engine/buf diff -rc gnusql-0.7b6.0/src/engine/chpars.c gnusql-0.7b6.1/src/engine/chpars.c *** gnusql-0.7b6.0/src/engine/chpars.c Mon Aug 17 18:17:54 1998 --- gnusql-0.7b6.1/src/engine/chpars.c Tue Sep 29 22:39:03 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko. * *************** *** 25,31 **** * */ ! /* $Id: chpars.c,v 1.247 1998/08/17 22:17:54 kimelman Exp $ */ #include "setup_os.h" #include --- 25,31 ---- * */ ! /* $Id: chpars.c,v 1.249 1998/09/30 02:39:03 kimelman Exp $ */ #include "setup_os.h" #include *************** *** 106,113 **** close (fddp); } ! i4_t ! main (i4_t argc, char **argv) { gss_client_t *cli_disp; static i4_t int_arg = 0; --- 106,113 ---- close (fddp); } ! int ! main (int argc, char **argv) { gss_client_t *cli_disp; static i4_t int_arg = 0; diff -rc gnusql-0.7b6.0/src/engine/dispatch.c gnusql-0.7b6.1/src/engine/dispatch.c *** gnusql-0.7b6.0/src/engine/dispatch.c Fri Aug 14 21:58:54 1998 --- gnusql-0.7b6.1/src/engine/dispatch.c Tue Sep 29 17:24:57 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: dispatch.c,v 1.248 1998/08/15 01:58:54 kimelman Exp $ */ #include "setup_os.h" #include --- 26,32 ---- * */ ! /* $Id: dispatch.c,v 1.249 1998/09/29 21:24:57 kimelman Exp $ */ #include "setup_os.h" #include diff -rc gnusql-0.7b6.0/src/engine/dispatch.h.preserve gnusql-0.7b6.1/src/engine/dispatch.h.preserve *** gnusql-0.7b6.0/src/engine/dispatch.h.preserve Mon Sep 28 21:56:07 1998 --- gnusql-0.7b6.1/src/engine/dispatch.h.preserve Tue Sep 29 22:47:13 1998 *************** *** 1,4 **** ! /* generated by /home/kimelman/etc/gsql/gl/etc/rpcgen-sh /usr/bin/rpcgen . dmode /home/kimelman/etc/gsql/gl/src/include/engine /home/kimelman/etc/gsql/gl/src/engine/dispatch.x at Mon Sep 28 01:12:54 EDT 1998*/ # include "conn_handler.h" /* * Please do not edit this file. --- 1,4 ---- ! /* generated by /home/kimelman/etc/gsql/gl/etc/rpcgen-sh /usr/bin/rpcgen . /home/kimelman/etc/gsql/gl/src/include/engine /home/kimelman/etc/gsql/gl/src/engine/dispatch.x at Tue Sep 29 22:00:17 EDT 1998*/ # include "conn_handler.h" /* * Please do not edit this file. diff -rc gnusql-0.7b6.0/src/engine/dispatch.x gnusql-0.7b6.1/src/engine/dispatch.x *** gnusql-0.7b6.0/src/engine/dispatch.x Fri Aug 14 12:56:35 1998 --- gnusql-0.7b6.1/src/engine/dispatch.x Tue Sep 29 17:18:59 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * diff -rc gnusql-0.7b6.0/src/engine/dispatch_svc.c.preserve gnusql-0.7b6.1/src/engine/dispatch_svc.c.preserve *** gnusql-0.7b6.0/src/engine/dispatch_svc.c.preserve Mon Sep 28 21:56:07 1998 --- gnusql-0.7b6.1/src/engine/dispatch_svc.c.preserve Tue Sep 29 22:47:13 1998 *************** *** 1,15 **** /* * Please do not edit this file. - * It was generated by /home/kimelman/etc/gsql/gl/etc/rpcgen-sh - */ - - #include "dispatch.h" - - #define main main_rpc_server - #define main_direct_server RUN_MY_SERVER - - /* - * Please do not edit this file. * It was generated using rpcgen. */ --- 1,5 ---- *************** *** 29,35 **** #endif #define _RPCSVC_CLOSEDOWN 120 ! #define RUN_MY_SERVER adm_rpc_start #define RPC_SVC_FG static int _rpcpmstart; /* Started by a port monitor ? */ --- 19,25 ---- #endif #define _RPCSVC_CLOSEDOWN 120 ! #define main adm_rpc_start #define RPC_SVC_FG static int _rpcpmstart; /* Started by a port monitor ? */ *************** *** 265,341 **** exit(1); /* NOTREACHED */ } - - #ifndef RPCGEN_ACTION - #define RPCGEN_ACTION - #endif - - /* - * Please do not edit this file. - * It was generated using rpcgen. - */ - - - struct rpcgen_table sql_disp_1_table[] = { - - (void *(*)())0, - (xdrproc_t) xdr_void, 0, - (xdrproc_t) xdr_void, 0, - - (void *(*)())RPCGEN_ACTION(create_transaction_1), - (xdrproc_t) xdr_init_arg, sizeof ( init_arg ), - (xdrproc_t) xdr_res, sizeof ( res ), - - (void *(*)())RPCGEN_ACTION(is_ready_1), - (xdrproc_t) xdr_opq, sizeof ( opq ), - (xdrproc_t) xdr_int, sizeof ( int ), - - (void *(*)())RPCGEN_ACTION(kill_all_1), - (xdrproc_t) xdr_int, sizeof ( int ), - (xdrproc_t) xdr_int, sizeof ( int ), - - (void *(*)())RPCGEN_ACTION(trn_kill_1), - (xdrproc_t) xdr_opq, sizeof ( opq ), - (xdrproc_t) xdr_int, sizeof ( int ), - - (void *(*)())RPCGEN_ACTION(disp_finit_1), - (xdrproc_t) xdr_int, sizeof ( int ), - (xdrproc_t) xdr_int, sizeof ( int ), - - (void *(*)())RPCGEN_ACTION(copy_lj_1), - (xdrproc_t) xdr_opq, sizeof ( opq ), - (xdrproc_t) xdr_int, sizeof ( int ), - - (void *(*)())RPCGEN_ACTION(change_params_1), - (xdrproc_t) xdr_int, sizeof ( int ), - (xdrproc_t) xdr_int, sizeof ( int ), - }; - int sql_disp_1_nproc = - sizeof(sql_disp_1_table)/sizeof(sql_disp_1_table[0]); - - gss_server_t *server = NULL; - - static void - gss_server_exit(void) - { - deallocate_gss_server(server); - } - - int - main_direct_server( - #ifdef RPCMAIN_PROTO - int argc, - char** argv - #else - void - #endif - ) - { - if (server==NULL) { - ATEXIT(gss_server_exit); - server = allocate_gss_server (); - register_gss_service(server, SQL_DISP, 1, sql_disp_1_table, sql_disp_1_nproc); - } - return run_gss_server (server, -2); /* wait foreever */ - } - --- 255,257 ---- diff -rc gnusql-0.7b6.0/src/engine/dyngspar.h gnusql-0.7b6.1/src/engine/dyngspar.h *** gnusql-0.7b6.0/src/engine/dyngspar.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/engine/dyngspar.h Tue Sep 29 17:24:58 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko. * *************** *** 28,34 **** #ifndef __dyngspar_h__ #define __dyngspar_h__ ! /* $Id: dyngspar.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #define D_MAX_FREE_EXTENTS_NUM 64 /* max free extents number in Administrator */ #define D_LJ_RED_BOUNDARY 2 /* max size of Logical Journal in journal pages */ --- 28,34 ---- #ifndef __dyngspar_h__ #define __dyngspar_h__ ! /* $Id: dyngspar.h,v 1.246 1998/09/29 21:24:58 kimelman Exp $ */ #define D_MAX_FREE_EXTENTS_NUM 64 /* max free extents number in Administrator */ #define D_LJ_RED_BOUNDARY 2 /* max size of Logical Journal in journal pages */ Only in gnusql-0.7b6.0/src/engine: engine_clnt.c Only in gnusql-0.7b6.0/src/engine: engine_svc.c diff -rc gnusql-0.7b6.0/src/engine/gspstr.h gnusql-0.7b6.1/src/engine/gspstr.h *** gnusql-0.7b6.0/src/engine/gspstr.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/engine/gspstr.h Tue Sep 29 17:24:58 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko. * *************** *** 28,34 **** #ifndef __gspstr_h___ #define __gspstr_h___ ! /* $Id: gspstr.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "admdef.h" --- 28,34 ---- #ifndef __gspstr_h___ #define __gspstr_h___ ! /* $Id: gspstr.h,v 1.246 1998/09/29 21:24:58 kimelman Exp $ */ #include "admdef.h" Common subdirectories: gnusql-0.7b6.0/src/engine/jour and gnusql-0.7b6.1/src/engine/jour diff -rc gnusql-0.7b6.0/src/engine/prepup.c gnusql-0.7b6.1/src/engine/prepup.c *** gnusql-0.7b6.0/src/engine/prepup.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/engine/prepup.c Tue Sep 29 17:24:59 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: prepup.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "setup_os.h" #include --- 26,32 ---- * */ ! /* $Id: prepup.c,v 1.246 1998/09/29 21:24:59 kimelman Exp $ */ #include "setup_os.h" #include Common subdirectories: gnusql-0.7b6.0/src/engine/rcvutl and gnusql-0.7b6.1/src/engine/rcvutl Common subdirectories: gnusql-0.7b6.0/src/engine/synch and gnusql-0.7b6.1/src/engine/synch Common subdirectories: gnusql-0.7b6.0/src/engine/trans and gnusql-0.7b6.1/src/engine/trans diff -rc gnusql-0.7b6.0/src/engine/buf/Makefile.in gnusql-0.7b6.1/src/engine/buf/Makefile.in *** gnusql-0.7b6.0/src/engine/buf/Makefile.in Mon Sep 28 02:09:24 1998 --- gnusql-0.7b6.1/src/engine/buf/Makefile.in Tue Sep 29 17:24:59 1998 *************** *** 2,12 **** ## GNU SQL Server (PUPSI Page Buffer) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.248 1998/09/28 06:03:05 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Server (PUPSI Page Buffer) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.249 1998/09/29 21:24:59 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/engine/buf/buf.c gnusql-0.7b6.1/src/engine/buf/buf.c *** gnusql-0.7b6.0/src/engine/buf/buf.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/engine/buf/buf.c Tue Sep 29 18:23:34 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: buf.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "fdeclbuf.h" #include "bufdefs.h" --- 26,32 ---- * */ ! /* $Id: buf.c,v 1.247 1998/09/29 22:23:34 kimelman Exp $ */ #include "fdeclbuf.h" #include "bufdefs.h" *************** *** 80,95 **** u2_t status; status = buf->b_status; ! if (status < USED) ! if (buf->b_next == buf) ! prios[status] = NULL; ! else ! { ! buf->b_next->b_prev = buf->b_prev; ! buf->b_prev->b_next = buf->b_next; ! if (prios[status] == buf) ! prios[status] = buf->b_next; ! } } void --- 80,96 ---- u2_t status; status = buf->b_status; ! if (status >= USED) ! return; ! if (buf->b_next == buf) ! prios[status] = NULL; ! else ! { ! buf->b_next->b_prev = buf->b_prev; ! buf->b_prev->b_next = buf->b_next; ! if (prios[status] == buf) ! prios[status] = buf->b_next; ! } } void diff -rc gnusql-0.7b6.0/src/engine/buf/bufdefs.h gnusql-0.7b6.1/src/engine/buf/bufdefs.h *** gnusql-0.7b6.0/src/engine/buf/bufdefs.h Sun Aug 24 12:28:05 1997 --- gnusql-0.7b6.1/src/engine/buf/bufdefs.h Tue Sep 29 17:25:00 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 30,36 **** #ifndef __bufdefs_h__ #define __bufdefs_h__ ! /* $Id: bufdefs.h,v 1.246 1997/08/24 16:28:05 kml Exp $ */ /***************************************************************************** --- 30,36 ---- #ifndef __bufdefs_h__ #define __bufdefs_h__ ! /* $Id: bufdefs.h,v 1.247 1998/09/29 21:25:00 kimelman Exp $ */ /***************************************************************************** diff -rc gnusql-0.7b6.0/src/engine/buf/bufipc.c gnusql-0.7b6.1/src/engine/buf/bufipc.c *** gnusql-0.7b6.0/src/engine/buf/bufipc.c Wed Aug 12 18:27:42 1998 --- gnusql-0.7b6.1/src/engine/buf/bufipc.c Tue Sep 29 18:23:34 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: bufipc.c,v 1.253 1998/08/12 22:27:42 kimelman Exp $ */ #include "setup_os.h" --- 26,32 ---- * */ ! /* $Id: bufipc.c,v 1.255 1998/09/29 22:23:34 kimelman Exp $ */ #include "setup_os.h" *************** *** 101,107 **** #define ARG(num, what, type) sscanf (argv[num], "%d", &argum); \ what = (type)(argum) ! void main (int argc, char **argv) { i4_t i, k; --- 101,107 ---- #define ARG(num, what, type) sscanf (argv[num], "%d", &argum); \ what = (type)(argum) ! int main (int argc, char **argv) { i4_t i, k; diff -rc gnusql-0.7b6.0/src/engine/buf/buflock.c gnusql-0.7b6.1/src/engine/buf/buflock.c *** gnusql-0.7b6.0/src/engine/buf/buflock.c Wed May 20 01:48:21 1998 --- gnusql-0.7b6.1/src/engine/buf/buflock.c Tue Sep 29 17:25:01 1998 *************** *** 11,17 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 11,17 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 33,39 **** * */ ! /* $Id: buflock.c,v 1.247 1998/05/20 05:48:21 kml Exp $ */ #include "setup_os.h" #include --- 33,39 ---- * */ ! /* $Id: buflock.c,v 1.248 1998/09/29 21:25:01 kimelman Exp $ */ #include "setup_os.h" #include diff -rc gnusql-0.7b6.0/src/engine/buf/fdeclbuf.h gnusql-0.7b6.1/src/engine/buf/fdeclbuf.h *** gnusql-0.7b6.0/src/engine/buf/fdeclbuf.h Mon Sep 21 17:59:51 1998 --- gnusql-0.7b6.1/src/engine/buf/fdeclbuf.h Tue Sep 29 22:39:03 1998 *************** *** 10,16 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify --- 10,16 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify *************** *** 34,40 **** #ifndef __fdeclbuf_h__ #define __fdeclbuf_h__ ! /* $Id: fdeclbuf.h,v 1.246 1998/05/20 05:48:21 kml Exp $ */ #include "setup_os.h" #include --- 34,40 ---- #ifndef __fdeclbuf_h__ #define __fdeclbuf_h__ ! /* $Id: fdeclbuf.h,v 1.248 1998/09/30 02:39:03 kimelman Exp $ */ #include "setup_os.h" #include *************** *** 57,63 **** /* 191 */ char *get_empty __P((unsigned size)); /* bufipc.c */ - /* 55 */ void main __P((int argc, char **argv)); /* 135 */ void msg_rcv __P((void)); /* 300 */ void buf_to_user __P((u2_t trnum, key_t keys)); /* 317 */ void user_p __P((u2_t conn, i4_t type)); --- 57,62 ---- diff -rc gnusql-0.7b6.0/src/engine/buf/get_put.c gnusql-0.7b6.1/src/engine/buf/get_put.c *** gnusql-0.7b6.0/src/engine/buf/get_put.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/engine/buf/get_put.c Tue Sep 29 17:25:02 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: get_put.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "setup_os.h" --- 27,33 ---- * */ ! /* $Id: get_put.c,v 1.246 1998/09/29 21:25:02 kimelman Exp $ */ #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/engine/buf/page.c gnusql-0.7b6.1/src/engine/buf/page.c *** gnusql-0.7b6.0/src/engine/buf/page.c Mon Mar 31 06:05:17 1997 --- gnusql-0.7b6.1/src/engine/buf/page.c Tue Sep 29 17:25:03 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: page.c,v 1.246 1997/03/31 11:05:17 kml Exp $ */ #include "setup_os.h" #include "inpop.h" --- 27,33 ---- * */ ! /* $Id: page.c,v 1.247 1998/09/29 21:25:03 kimelman Exp $ */ #include "setup_os.h" #include "inpop.h" diff -rc gnusql-0.7b6.0/src/engine/buf/queue.c gnusql-0.7b6.1/src/engine/buf/queue.c *** gnusql-0.7b6.0/src/engine/buf/queue.c Sun Aug 24 12:29:59 1997 --- gnusql-0.7b6.1/src/engine/buf/queue.c Tue Sep 29 17:25:03 1998 *************** *** 9,15 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 9,15 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 31,37 **** * */ ! /* $Id: queue.c,v 1.246 1997/08/24 16:29:59 kml Exp $ */ #include "setup_os.h" #include "inpop.h" --- 31,37 ---- * */ ! /* $Id: queue.c,v 1.247 1998/09/29 21:25:03 kimelman Exp $ */ #include "setup_os.h" #include "inpop.h" diff -rc gnusql-0.7b6.0/src/engine/jour/Makefile.in gnusql-0.7b6.1/src/engine/jour/Makefile.in *** gnusql-0.7b6.0/src/engine/jour/Makefile.in Mon Sep 28 20:39:35 1998 --- gnusql-0.7b6.1/src/engine/jour/Makefile.in Tue Sep 29 21:59:09 1998 *************** *** 4,14 **** ## mj - Microjournal in PUPSI ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.247 1998/09/29 00:39:35 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 4,14 ---- ## mj - Microjournal in PUPSI ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.249 1998/09/30 01:59:09 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## *************** *** 45,51 **** bin: lj mj ! SRCL= logj.c helpfu.c ljipc.c SRCLOBS= ${SRCL:.c=.o} SRCM= microj.c mjipc.c helpfu.c SRCMOBS= ${SRCM:.c=.o} --- 45,51 ---- bin: lj mj ! SRCL= logj.c ljipc.c helpfu.c SRCLOBS= ${SRCL:.c=.o} SRCM= microj.c mjipc.c helpfu.c SRCMOBS= ${SRCM:.c=.o} diff -rc gnusql-0.7b6.0/src/engine/jour/fdecllj.h gnusql-0.7b6.1/src/engine/jour/fdecllj.h *** gnusql-0.7b6.0/src/engine/jour/fdecllj.h Mon Sep 28 20:25:25 1998 --- gnusql-0.7b6.1/src/engine/jour/fdecllj.h Tue Sep 29 22:39:45 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 24,30 **** * * Contacts: gss@ispras.ru * ! * $Id: fdecllj.h,v 1.246 1998/05/20 05:49:51 kml Exp $ */ #ifndef __fdecllj_h__ --- 24,30 ---- * * Contacts: gss@ispras.ru * ! * $Id: fdecllj.h,v 1.248 1998/09/30 02:39:45 kimelman Exp $ */ #ifndef __fdecllj_h__ *************** *** 43,49 **** /* 150 */ void overflow_mj (void); /* ljipc.c */ - /* 29 */ void main (int argc, char **argv); /* 133 */ i4_t BUF_INIFIXB (struct ADBL ADR, i4_t nop); /* 158 */ void ADML_COPY (void); /* 169 */ void ADM_ERRFU (i4_t p); --- 43,48 ---- *************** *** 52,57 **** --- 51,57 ---- /* 253 */ void push_microj (); /* helpfu.c */ + /* ?? */ char **helpfu_init(void); /* 25 */ void getrfile (i4_t fd); /* 35 */ void get_last_page (i4_t fd); /* 59 */ i4_t get_page (i4_t j, u2_t N, i4_t fd); diff -rc gnusql-0.7b6.0/src/engine/jour/fdeclmj.h gnusql-0.7b6.1/src/engine/jour/fdeclmj.h *** gnusql-0.7b6.0/src/engine/jour/fdeclmj.h Mon Sep 28 20:25:26 1998 --- gnusql-0.7b6.1/src/engine/jour/fdeclmj.h Tue Sep 29 22:39:46 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 24,30 **** * * Contacts: gss@ispras.ru * ! * $Id: fdeclmj.h,v 1.246 1998/06/01 15:03:34 kimelman Exp $ */ --- 24,30 ---- * * Contacts: gss@ispras.ru * ! * $Id: fdeclmj.h,v 1.248 1998/09/30 02:39:46 kimelman Exp $ */ *************** *** 46,51 **** --- 46,52 ---- /* 211 */ void mjini (char *mj_name); /* helpfu.c */ + /* ?? */ char **helpfu_init(void); /* 25 */ void getrfile (i4_t fd); /* 35 */ void get_last_page (i4_t fd); /* 59 */ i4_t get_page (i4_t j, u2_t N, i4_t fd); diff -rc gnusql-0.7b6.0/src/engine/jour/helpfu.c gnusql-0.7b6.1/src/engine/jour/helpfu.c *** gnusql-0.7b6.0/src/engine/jour/helpfu.c Wed May 20 01:49:51 1998 --- gnusql-0.7b6.1/src/engine/jour/helpfu.c Tue Sep 29 22:39:46 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: helpfu.c,v 1.246 1998/05/20 05:49:51 kml Exp $ */ #include "setup_os.h" #include --- 26,32 ---- * */ ! /* $Id: helpfu.c,v 1.248 1998/09/30 02:39:46 kimelman Exp $ */ #include "setup_os.h" #include *************** *** 45,52 **** #include "fdeclmj.h" #include "xmem.h" ! extern char pl1[RPAGE], pl2[RPAGE]; ! extern char *p[2]; extern u2_t pushpn[2]; /* contains the page number*/ extern i4_t PROB[2]; /* state of JOURN-pushs (i=0,1) */ extern i4_t RFILE; --- 45,53 ---- #include "fdeclmj.h" #include "xmem.h" ! static char pl1[RPAGE], pl2[RPAGE]; ! static char *push_ptr[2]; ! extern u2_t pushpn[2]; /* contains the page number*/ extern i4_t PROB[2]; /* state of JOURN-pushs (i=0,1) */ extern i4_t RFILE; *************** *** 56,61 **** --- 57,70 ---- #define size2b sizeof(u2_t) #define size4b sizeof(i4_t) + char ** + helpfu_init(void) + { + push_ptr[0] = pl1; + push_ptr[1] = pl2; + return push_ptr; + } + void getrfile (i4_t fd) { *************** *** 78,95 **** pushpn[0] = (u2_t) ~ 0; pushpn[1] = 0; READPG (1, 0, fd); ! NB = t4bunpack (p[0]); for (N = 1, i = 0;; N++) { ilast = i; if (N == RFILE) break; ! PCP = *(p[i] + size4b + size2b); if (PCP == SIGN_NOCONT) break; i = (i == 0) ? 1 : 0; READPG (N, i, fd); ! if (NB != t4bunpack (p[i])) { i = (i == 0) ? 1 : 0; break; --- 87,104 ---- pushpn[0] = (u2_t) ~ 0; pushpn[1] = 0; READPG (1, 0, fd); ! NB = t4bunpack (push_ptr[0]); for (N = 1, i = 0;; N++) { ilast = i; if (N == RFILE) break; ! PCP = *(push_ptr[i] + size4b + size2b); if (PCP == SIGN_NOCONT) break; i = (i == 0) ? 1 : 0; READPG (N, i, fd); ! if (NB != t4bunpack (push_ptr[i])) { i = (i == 0) ? 1 : 0; break; *************** *** 138,146 **** { /* the top-block places in two pages*/ char buff[size2b]; n1 = RTBLK - n; ! bcopy (p[k] + RTPAGE, buff + n1, n); k = get_page (k, pushpn[k] - 1, fd); ! end_of_record = p[k] + RPAGE - n1; bcopy (end_of_record, buff, n1); razm = t2bunpack (buff); n = RPAGE - RTPAGE - n1; --- 147,155 ---- { /* the top-block places in two pages*/ char buff[size2b]; n1 = RTBLK - n; ! bcopy (push_ptr[k] + RTPAGE, buff + n1, n); k = get_page (k, pushpn[k] - 1, fd); ! end_of_record = push_ptr[k] + RPAGE - n1; bcopy (end_of_record, buff, n1); razm = t2bunpack (buff); n = RPAGE - RTPAGE - n1; *************** *** 147,159 **** } else { /* the top-block places in (N)-page */ ! end_of_record = p[k] + n + RTPAGE - RTBLK; razm = t2bunpack (end_of_record); n -= RTBLK; if (n == 0) { k = get_page (k, pushpn[k] - 1, fd); ! end_of_record = p[k] + RPAGE; n = RPAGE - RTPAGE; } } --- 156,168 ---- } else { /* the top-block places in (N)-page */ ! end_of_record = push_ptr[k] + n + RTPAGE - RTBLK; razm = t2bunpack (end_of_record); n -= RTBLK; if (n == 0) { k = get_page (k, pushpn[k] - 1, fd); ! end_of_record = push_ptr[k] + RPAGE; n = RPAGE - RTPAGE; } } *************** *** 163,171 **** if (n < razm) { /* block-record places in two pages */ n1 = razm - n; ! bcopy (p[k] + RTPAGE, pnt + n1, n); k = get_page (k, pushpn[k] - 1, fd); ! bcopy (p[k] + RPAGE - n1, pnt, n1); } else /*block-record places in (N)-page all*/ bcopy (end_of_record - razm, pnt, razm); --- 172,180 ---- if (n < razm) { /* block-record places in two pages */ n1 = razm - n; ! bcopy (push_ptr[k] + RTPAGE, pnt + n1, n); k = get_page (k, pushpn[k] - 1, fd); ! bcopy (push_ptr[k] + RPAGE - n1, pnt, n1); } else /*block-record places in (N)-page all*/ bcopy (end_of_record - razm, pnt, razm); *************** *** 188,194 **** j = 0; for (i = n; i <= RFILE; i++) { ! t4bpack (0, p[j]); PROB[j] = 2; pushpn[j] = i; out_push (j, 1); /*with wait*/ --- 197,203 ---- j = 0; for (i = n; i <= RFILE; i++) { ! t4bpack (0, push_ptr[j]); PROB[j] = 2; pushpn[j] = i; out_push (j, 1); /*with wait*/ *************** *** 283,289 **** t2bpack (size, buff); bcopy (buff, a, n); do_cont (); ! a = p[ilast] + RTPAGE; n1 = RTBLK - n; bcopy (buff + n, a, n1); a += n1; --- 292,298 ---- t2bpack (size, buff); bcopy (buff, a, n); do_cont (); ! a = push_ptr[ilast] + RTPAGE; n1 = RTBLK - n; bcopy (buff + n, a, n1); a += n1; *************** *** 301,311 **** { register char *a; ! *(p[ilast] + size4b + size2b) = SIGN_CONT; out_push (ilast, 0); pushpn[(ilast == 0) ? 1 : 0] = pushpn[ilast] + 1; ilast = (ilast == 0) ? 1 : 0; ! a = p[ilast]; t4bpack (NB, a); a += size4b; t2bpack (RTPAGE, a); --- 310,320 ---- { register char *a; ! *(push_ptr[ilast] + size4b + size2b) = SIGN_CONT; out_push (ilast, 0); pushpn[(ilast == 0) ? 1 : 0] = pushpn[ilast] + 1; ilast = (ilast == 0) ? 1 : 0; ! a = push_ptr[ilast]; t4bpack (NB, a); a += size4b; t2bpack (RTPAGE, a); diff -rc gnusql-0.7b6.0/src/engine/jour/ljipc.c gnusql-0.7b6.1/src/engine/jour/ljipc.c *** gnusql-0.7b6.0/src/engine/jour/ljipc.c Wed May 20 17:17:26 1998 --- gnusql-0.7b6.1/src/engine/jour/ljipc.c Tue Sep 29 18:23:35 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: ljipc.c,v 1.248 1998/05/20 21:17:26 kimelman Exp $ */ #include "setup_os.h" #include "xmem.h" --- 26,32 ---- * */ ! /* $Id: ljipc.c,v 1.250 1998/09/29 22:23:35 kimelman Exp $ */ #include "setup_os.h" #include "xmem.h" *************** *** 60,66 **** #define PRINT(x, y) /*PRINTF((x, y))*/ ! void main (int argc, char **argv) { i4_t op, rep; --- 60,66 ---- #define PRINT(x, y) /*PRINTF((x, y))*/ ! int main (int argc, char **argv) { i4_t op, rep; diff -rc gnusql-0.7b6.0/src/engine/jour/logj.c gnusql-0.7b6.1/src/engine/jour/logj.c *** gnusql-0.7b6.0/src/engine/jour/logj.c Wed May 20 01:49:51 1998 --- gnusql-0.7b6.1/src/engine/jour/logj.c Tue Sep 29 22:39:47 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: logj.c,v 1.246 1998/05/20 05:49:51 kml Exp $ */ #include "setup_os.h" #include --- 26,32 ---- * */ ! /* $Id: logj.c,v 1.248 1998/09/30 02:39:47 kimelman Exp $ */ #include "setup_os.h" #include *************** *** 37,83 **** #include "fdecllj.h" #include "xmem.h" ! char *p[2]; /* push-pointers*/ ! char pl1[RPAGE], pl2[RPAGE]; ! i4_t fdlj; /* file descriptor "LJOURN" */ ! u2_t pushpn[2]; /* contains the page number*/ i4_t PROB[2]; /* state of LJ-pushs (i=0,1) : PROB[i]=-1 - initial state; PROB[i]= 2 - filling of a push is continuing(PUTREC,PUTHREC,PUTOUT) PROB[i]= 1 - write operation of a push on disk has began, ! a push has loaded; PROB[i]= 0 - write operation of a push on disk has finished, ! a push has loaded again */ i4_t ilast; /* the number of page, contained the last page of journal*/ - i4_t NOP; /* operation counter */ i4_t RFILE; /* */ i4_t REDLINE; /* */ i4_t MPAGE; ! i4_t NB; /* LJ-version number*/ ! struct ADREC RREC; /* razmer-record */ struct ADBL ABLOCK; /* blocks address */ - #define size2b sizeof(u2_t) - #define size4b sizeof(i4_t) - void INI () { struct ADBL adlj; ! ! p[0] = pl1; ! p[1] = pl2; getrfile (fdlj); get_last_page (fdlj); if (NB == 0) { NB = 1; ! t4bpack (NB, p[ilast]); } adlj.npage = pushpn[ilast]; ! adlj.cm = t2bunpack (p[ilast] + size4b); NOP = 0; /* rep = BUF_INIFIXB (adlj, NOP);*/ } --- 37,79 ---- #include "fdecllj.h" #include "xmem.h" + #define size2b sizeof(i2_t) + #define size4b sizeof(i4_t) ! static char **push_ptr; /* push-pointers*/ ! u2_t pushpn[2]; /* contains the page number*/ i4_t PROB[2]; /* state of LJ-pushs (i=0,1) : PROB[i]=-1 - initial state; PROB[i]= 2 - filling of a push is continuing(PUTREC,PUTHREC,PUTOUT) PROB[i]= 1 - write operation of a push on disk has began, ! a push has loaded; PROB[i]= 0 - write operation of a push on disk has finished, ! a push has loaded again */ i4_t ilast; /* the number of page, contained the last page of journal*/ i4_t RFILE; /* */ i4_t REDLINE; /* */ i4_t MPAGE; ! i4_t fdlj; /* log file descriptor */ struct ADBL ABLOCK; /* blocks address */ + i4_t NB; /* log version number */ + struct ADREC RREC; /* razmer-record */ + i4_t NOP; /* operation counter */ void INI () { struct ADBL adlj; ! push_ptr = helpfu_init(); getrfile (fdlj); get_last_page (fdlj); if (NB == 0) { NB = 1; ! t4bpack (NB, push_ptr[ilast]); } adlj.npage = pushpn[ilast]; ! adlj.cm = t2bunpack (push_ptr[ilast] + size4b); NOP = 0; /* rep = BUF_INIFIXB (adlj, NOP);*/ } *************** *** 89,100 **** struct ADBL adlj; READPG (1, 0, fdlj); ! NB = t4bunpack (p[0]); NB += 1; PRINTF (("LOGJ.renew: NB = %d, REDLINE = %d\n", (i4_t)NB, REDLINE)); ! t4bpack (NB, p[0]); ! t2bpack (RTPAGE, p[0] + size4b); ! *(p[0] + size4b + size2b) = SIGN_NOCONT; /*PCP=free*/ WRITEPG (0, 1, fdlj); adlj.npage = 1; adlj.cm = RTPAGE; --- 85,96 ---- struct ADBL adlj; READPG (1, 0, fdlj); ! NB = t4bunpack (push_ptr[0]); NB += 1; PRINTF (("LOGJ.renew: NB = %d, REDLINE = %d\n", (i4_t)NB, REDLINE)); ! t4bpack (NB, push_ptr[0]); ! t2bpack (RTPAGE, push_ptr[0] + size4b); ! *(push_ptr[0] + size4b + size2b) = SIGN_NOCONT; /*PCP=free*/ WRITEPG (0, 1, fdlj); adlj.npage = 1; adlj.cm = RTPAGE; *************** *** 105,127 **** } void - begfix (void) /*This function writes all push-buffers into disk and sends SPB*/ - { - struct ADBL adlj; - i4_t rep; - - out_push (ilast, 1); - adlj.npage = pushpn[ilast]; - adlj.cm = t2bunpack (p[ilast] + size4b); - rep = BUF_INIFIXB (adlj, NOP); - NOP = 0; - ans_adm (rep); - } - - void PUTRC (u2_t razm, char * block) { ! register int off; register char *a, *lastb; assert (razm < RPAGE); --- 101,109 ---- } void PUTRC (u2_t razm, char * block) { ! register u2_t off; register char *a, *lastb; assert (razm < RPAGE); *************** *** 128,145 **** if (PROB[ilast] == 1) WAIT (ilast); PROB[ilast] = 2; ! a = p[ilast] + size4b; off = t2bunpack (a); ! a = p[ilast] + off; a = write_topblock (razm, off, a); ! lastb = p[ilast] + RPAGE; if (a + razm > lastb) ! { /* block-record places in two page*/ u2_t n, n1; n1 = lastb - a; bcopy (block, a, n1); do_cont (); ! a = p[ilast] + RTPAGE; n = razm - n1; bcopy (block + n1, a, n); a += n; --- 110,127 ---- if (PROB[ilast] == 1) WAIT (ilast); PROB[ilast] = 2; ! a = push_ptr[ilast] + size4b; off = t2bunpack (a); ! a = push_ptr[ilast] + off; a = write_topblock (razm, off, a); ! lastb = push_ptr[ilast] + RPAGE; if (a + razm > lastb) ! { /* block-record places in two page */ u2_t n, n1; n1 = lastb - a; bcopy (block, a, n1); do_cont (); ! a = push_ptr[ilast] + RTPAGE; n = razm - n1; bcopy (block + n1, a, n); a += n; *************** *** 149,157 **** bcopy (block, a, razm); a += razm; } ! a = write_topblock (razm, a - p[ilast], a); ! off = a - p[ilast]; ! t2bpack (off, p[ilast] + size4b); ABLOCK.cm = off; ABLOCK.npage = pushpn[ilast]; } --- 131,139 ---- bcopy (block, a, razm); a += razm; } ! a = write_topblock (razm, a - push_ptr[ilast], a); ! off = a - push_ptr[ilast]; ! t2bpack (off, push_ptr[ilast] + size4b); ABLOCK.cm = off; ABLOCK.npage = pushpn[ilast]; } *************** *** 175,182 **** } void ! write_disk (i, c) /* this function writes push number "i" into disk; */ ! i4_t i, c; /* c= 1 - wait, 0 - no wait;*/ { i4_t N; --- 157,164 ---- } void ! write_disk (i4_t i, i4_t c) /* Write push number "i" to disk */ ! /* c= 1 - wait, 0 - no wait;*/ { i4_t N; *************** *** 183,188 **** --- 165,171 ---- N = pushpn[i]; if (N > RFILE) MOREFILE (MPAGE); + if (N == REDLINE) { PRINTF (("LOGJ.write_disk: reguest copy NB = %d, pagenum = %d\n", *************** *** 190,196 **** ADML_COPY (); REDLINE = 0; } - WRITEPG (i, c, fdlj); } --- 173,178 ---- *************** *** 203,210 **** i4_t rep; out_push (ilast, 1); adlj.npage = pushpn[ilast]; ! adlj.cm = t2bunpack (p[ilast] + size4b); rep = BUF_INIFIXB (adlj, NOP); NOP = 0; } } --- 185,206 ---- i4_t rep; out_push (ilast, 1); adlj.npage = pushpn[ilast]; ! adlj.cm = t2bunpack (push_ptr[ilast] + size4b); rep = BUF_INIFIXB (adlj, NOP); NOP = 0; } } + void + begfix (void) /*This function writes all push-buffers into disk and sends SPB*/ + { + struct ADBL adlj; + i4_t rep; + + out_push (ilast, 1); + adlj.npage = pushpn[ilast]; + adlj.cm = t2bunpack (push_ptr[ilast] + size4b); + rep = BUF_INIFIXB (adlj, NOP); + NOP = 0; + ans_adm (rep); + } + diff -rc gnusql-0.7b6.0/src/engine/jour/microj.c gnusql-0.7b6.1/src/engine/jour/microj.c *** gnusql-0.7b6.0/src/engine/jour/microj.c Tue Nov 4 13:35:20 1997 --- gnusql-0.7b6.1/src/engine/jour/microj.c Tue Sep 29 22:39:47 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: microj.c,v 1.246 1997/11/04 18:35:20 kml Exp $ */ #include "setup_os.h" #if HAVE_UNSTD_H --- 26,32 ---- * */ ! /* $Id: microj.c,v 1.249 1998/09/30 02:39:47 kimelman Exp $ */ #include "setup_os.h" #if HAVE_UNSTD_H *************** *** 35,45 **** #if HAVE_FCNTL_H #include #endif #include #include "rnmtp.h" #include "pupsi.h" - #include "sql.h" #include "strml.h" #include "fdeclmj.h" #include "xmem.h" --- 35,45 ---- #if HAVE_FCNTL_H #include #endif + #include "sql.h" #include #include "rnmtp.h" #include "pupsi.h" #include "strml.h" #include "fdeclmj.h" #include "xmem.h" *************** *** 47,56 **** #define size2b sizeof(i2_t) #define size4b sizeof(i4_t) ! ! char *p[2]; /*char pointers*/ ! char pl1[RPAGE], pl2[RPAGE]; ! u2_t pushpn[2]; /*contains the page number*/ i4_t PROB[2]; /*state of MJ-pushs (i=0,1) : PROB[i]=-1 - initial state; PROB[i]= 2 - filling of a push is continuing (PUTBL); --- 47,54 ---- #define size2b sizeof(i2_t) #define size4b sizeof(i4_t) ! static char **push_ptr; /* push-pointers*/ ! u2_t pushpn[2]; /*contains the page number*/ i4_t PROB[2]; /*state of MJ-pushs (i=0,1) : PROB[i]=-1 - initial state; PROB[i]= 2 - filling of a push is continuing (PUTBL); *************** *** 62,77 **** i4_t RFILE; /* size of MJ-file (in pages) */ i4_t REDLINE, RET_RLINE; i4_t MPAGE; ! i4_t fdmj = 0; ! struct ADBL ABLOCK; /* block address */ ! i4_t NB; /* MJ-version number */ int INI (char *pnt) /* MJ- initialisation */ { ! p[0] = pl1; ! p[1] = pl2; if ((fdmj = open (pnt, O_RDWR, 0644)) < 0) { perror ("MJ: open error"); --- 60,74 ---- i4_t RFILE; /* size of MJ-file (in pages) */ i4_t REDLINE, RET_RLINE; i4_t MPAGE; ! i4_t fdmj = 0; /* log file descriptor */ ! struct ADBL ABLOCK; /* blocks address */ ! i4_t NB; /* log version number */ int INI (char *pnt) /* MJ- initialisation */ { ! push_ptr = helpfu_init(); if ((fdmj = open (pnt, O_RDWR, 0644)) < 0) { perror ("MJ: open error"); *************** *** 85,91 **** { PICTURE (2); NB = 1; ! t4bpack (NB, p[ilast]); if (write (fdmj, (char *) &NB, size4b) != size4b) { perror ("MJ: write error"); --- 82,88 ---- { PICTURE (2); NB = 1; ! t4bpack (NB, push_ptr[ilast]); if (write (fdmj, (char *) &NB, size4b) != size4b) { perror ("MJ: write error"); *************** *** 102,108 **** void putbl (u2_t razm, char * block) { /*this function puts block ADBL in the last page MJ */ ! register off; register char *a, *lastb; assert (razm < RPAGE); --- 99,105 ---- void putbl (u2_t razm, char * block) { /*this function puts block ADBL in the last page MJ */ ! register u2_t off; register char *a, *lastb; assert (razm < RPAGE); *************** *** 109,118 **** if (PROB[ilast] == 1) WAIT (ilast); PROB[ilast] = 2; ! a = p[ilast] + size4b; off = t2bunpack (a); ! a = p[ilast] + off; ! lastb = p[ilast] + RPAGE; if (a + razm > lastb) { /* block-record places in two page */ u2_t n, n1; --- 106,115 ---- if (PROB[ilast] == 1) WAIT (ilast); PROB[ilast] = 2; ! a = push_ptr[ilast] + size4b; off = t2bunpack (a); ! a = push_ptr[ilast] + off; ! lastb = push_ptr[ilast] + RPAGE; if (a + razm > lastb) { /* block-record places in two page */ u2_t n, n1; *************** *** 119,125 **** n1 = lastb - a; bcopy (block, a, n1); do_cont (); ! a = p[ilast] + RTPAGE; n = razm - n1; bcopy (block + n1, a, n); a += n; --- 116,122 ---- n1 = lastb - a; bcopy (block, a, n1); do_cont (); ! a = push_ptr[ilast] + RTPAGE; n = razm - n1; bcopy (block + n1, a, n); a += n; *************** *** 129,137 **** bcopy (block, a, razm); a += razm; } ! a = write_topblock (razm, a - p[ilast], a); ! off = a - p[ilast]; ! t2bpack (off, p[ilast] + size4b); ABLOCK.cm = off; ABLOCK.npage = pushpn[ilast]; } --- 126,134 ---- bcopy (block, a, razm); a += razm; } ! a = write_topblock (razm, a - push_ptr[ilast], a); ! off = a - push_ptr[ilast]; ! t2bpack (off, push_ptr[ilast] + size4b); ABLOCK.cm = off; ABLOCK.npage = pushpn[ilast]; } *************** *** 144,150 **** READPG (1, 0, fdmj); pushpn[1] = 0; ! a = p[0]; NB += 1; if (NB == 0) NB = 1; --- 141,147 ---- READPG (1, 0, fdmj); pushpn[1] = 0; ! a = push_ptr[0]; NB += 1; if (NB == 0) NB = 1; diff -rc gnusql-0.7b6.0/src/engine/jour/mjipc.c gnusql-0.7b6.1/src/engine/jour/mjipc.c *** gnusql-0.7b6.0/src/engine/jour/mjipc.c Wed May 20 01:49:51 1998 --- gnusql-0.7b6.1/src/engine/jour/mjipc.c Tue Sep 29 17:25:08 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: mjipc.c,v 1.247 1998/05/20 05:49:51 kml Exp $ */ #include "setup_os.h" #include "xmem.h" --- 26,32 ---- * */ ! /* $Id: mjipc.c,v 1.248 1998/09/29 21:25:08 kimelman Exp $ */ #include "setup_os.h" #include "xmem.h" diff -rc gnusql-0.7b6.0/src/engine/rcvutl/Makefile.in gnusql-0.7b6.1/src/engine/rcvutl/Makefile.in *** gnusql-0.7b6.0/src/engine/rcvutl/Makefile.in Mon Sep 28 20:39:36 1998 --- gnusql-0.7b6.1/src/engine/rcvutl/Makefile.in Tue Sep 29 17:25:08 1998 *************** *** 2,12 **** ## GNU SQL Server (crash recovery utilities) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.248 1998/09/29 00:39:36 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Server (crash recovery utilities) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.249 1998/09/29 21:25:08 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/engine/rcvutl/fdclrcv.h gnusql-0.7b6.1/src/engine/rcvutl/fdclrcv.h *** gnusql-0.7b6.0/src/engine/rcvutl/fdclrcv.h Mon Sep 28 20:31:51 1998 --- gnusql-0.7b6.1/src/engine/rcvutl/fdclrcv.h Tue Sep 29 22:05:06 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * Generated automatically by mkptypes. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * Generated automatically by mkptypes. * *************** *** 30,36 **** #ifndef __fdclrcv_h__ #define __fdclrcv_h__ ! /* $Id: fdclrcv.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "f1f2decl.h" --- 30,36 ---- #ifndef __fdclrcv_h__ #define __fdclrcv_h__ ! /* $Id: fdclrcv.h,v 1.246 1998/09/29 21:25:09 kimelman Exp $ */ #include "f1f2decl.h" diff -rc gnusql-0.7b6.0/src/engine/rcvutl/libini.c gnusql-0.7b6.1/src/engine/rcvutl/libini.c *** gnusql-0.7b6.0/src/engine/rcvutl/libini.c Fri Sep 11 14:15:20 1998 --- gnusql-0.7b6.1/src/engine/rcvutl/libini.c Tue Sep 29 17:25:09 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: libini.c,v 1.247 1998/09/11 18:15:20 kimelman Exp $ */ #include "setup_os.h" --- 26,32 ---- * */ ! /* $Id: libini.c,v 1.248 1998/09/29 21:25:09 kimelman Exp $ */ #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/engine/rcvutl/librcv.c gnusql-0.7b6.1/src/engine/rcvutl/librcv.c *** gnusql-0.7b6.0/src/engine/rcvutl/librcv.c Wed Sep 16 14:59:22 1998 --- gnusql-0.7b6.1/src/engine/rcvutl/librcv.c Tue Sep 29 17:25:10 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: librcv.c,v 1.252 1998/09/16 03:30:22 kimelman Exp $ */ #include "setup_os.h" #if STDC_HEADERS --- 25,31 ---- * */ ! /* $Id: librcv.c,v 1.253 1998/09/29 21:25:10 kimelman Exp $ */ #include "setup_os.h" #if STDC_HEADERS diff -rc gnusql-0.7b6.0/src/engine/rcvutl/memcr.c gnusql-0.7b6.1/src/engine/rcvutl/memcr.c *** gnusql-0.7b6.0/src/engine/rcvutl/memcr.c Mon Sep 28 20:39:36 1998 --- gnusql-0.7b6.1/src/engine/rcvutl/memcr.c Tue Sep 29 22:39:04 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: memcr.c,v 1.246 1998/09/29 00:39:36 kimelman Exp $ */ #include "setup_os.h" #include --- 26,32 ---- * */ ! /* $Id: memcr.c,v 1.248 1998/09/30 02:39:04 kimelman Exp $ */ #include "setup_os.h" #include *************** *** 448,454 **** } int ! main (i4_t argc, char **argv) { register char *a; u2_t n, blsz; --- 448,454 ---- } int ! main (int argc, char **argv) { register char *a; u2_t n, blsz; diff -rc gnusql-0.7b6.0/src/engine/rcvutl/puprcv.h gnusql-0.7b6.1/src/engine/rcvutl/puprcv.h *** gnusql-0.7b6.0/src/engine/rcvutl/puprcv.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/engine/rcvutl/puprcv.h Tue Sep 29 17:25:11 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: puprcv.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "pupsi.h" #ifndef DIR_SQLSER --- 25,31 ---- * */ ! /* $Id: puprcv.h,v 1.246 1998/09/29 21:25:11 kimelman Exp $ */ #include "pupsi.h" #ifndef DIR_SQLSER diff -rc gnusql-0.7b6.0/src/engine/rcvutl/strgcr.c gnusql-0.7b6.1/src/engine/rcvutl/strgcr.c *** gnusql-0.7b6.0/src/engine/rcvutl/strgcr.c Mon Sep 28 20:39:37 1998 --- gnusql-0.7b6.1/src/engine/rcvutl/strgcr.c Tue Sep 29 22:39:04 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: strgcr.c,v 1.249 1998/09/29 00:39:37 kimelman Exp $ */ #include "setup_os.h" #include "xmem.h" --- 25,31 ---- * */ ! /* $Id: strgcr.c,v 1.252 1998/09/30 02:39:04 kimelman Exp $ */ #include "setup_os.h" #include "xmem.h" *************** *** 310,328 **** k = FIRSTMQN; #endif errno = 0; ! for(;;) { ! if ( msgget (k, DEFAULT_ACCESS_RIGHTS) < 0 ) ! if (errno == ENOENT) ! return k++; ! else if (errno == ENOSPC) ! return -1; ! k++; } } ! void ! main (void) { struct ADBL cadlj, ladlj; char *dname; --- 310,328 ---- k = FIRSTMQN; #endif errno = 0; ! for(;;k++) { ! if ( msgget (k, DEFAULT_ACCESS_RIGHTS) >= 0 ) ! continue; ! if (errno == ENOENT) ! return k++; ! else if (errno == ENOSPC) ! return -1; } } ! int ! main (int argc,char **argv) { struct ADBL cadlj, ladlj; char *dname; *************** *** 435,439 **** --- 435,440 ---- dubl_segs (); msgctl (msqidscr, IPC_RMID, &msqidds); fprintf (stderr, "SCR: Storage Crash Recovery has finished successfully\n"); + return 0; } diff -rc gnusql-0.7b6.0/src/engine/synch/Makefile.in gnusql-0.7b6.1/src/engine/synch/Makefile.in *** gnusql-0.7b6.0/src/engine/synch/Makefile.in Mon Sep 28 02:09:26 1998 --- gnusql-0.7b6.1/src/engine/synch/Makefile.in Tue Sep 29 17:25:12 1998 *************** *** 2,12 **** ## GNU SQL Server ( Synchronizer ) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.247 1998/09/28 06:03:06 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Server ( Synchronizer ) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.248 1998/09/29 21:25:12 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/engine/synch/dessnch.h gnusql-0.7b6.1/src/engine/synch/dessnch.h *** gnusql-0.7b6.0/src/engine/synch/dessnch.h Thu Aug 20 20:26:51 1998 --- gnusql-0.7b6.1/src/engine/synch/dessnch.h Tue Sep 29 17:25:13 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: dessnch.h,v 1.247 1998/08/21 00:26:51 kimelman Exp $ */ /* Internal structures of synchronizer */ --- 25,31 ---- * */ ! /* $Id: dessnch.h,v 1.248 1998/09/29 21:25:13 kimelman Exp $ */ /* Internal structures of synchronizer */ diff -rc gnusql-0.7b6.0/src/engine/synch/dlock.c gnusql-0.7b6.1/src/engine/synch/dlock.c *** gnusql-0.7b6.0/src/engine/synch/dlock.c Tue Aug 18 01:37:30 1998 --- gnusql-0.7b6.1/src/engine/synch/dlock.c Tue Sep 29 17:25:13 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: dlock.c,v 1.249 1998/08/18 05:36:42 kimelman Exp $ */ #include "xmem.h" #include "dessnch.h" --- 25,31 ---- * */ ! /* $Id: dlock.c,v 1.250 1998/09/29 21:25:13 kimelman Exp $ */ #include "xmem.h" #include "dessnch.h" diff -rc gnusql-0.7b6.0/src/engine/synch/fdclsyn.h gnusql-0.7b6.1/src/engine/synch/fdclsyn.h *** gnusql-0.7b6.0/src/engine/synch/fdclsyn.h Thu Aug 20 20:27:43 1998 --- gnusql-0.7b6.1/src/engine/synch/fdclsyn.h Tue Sep 29 22:39:05 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: fdclsyn.h,v 1.248 1998/08/21 00:27:43 kimelman Exp $ */ #include "cmpdecl.h" #include "totdecl.h" --- 25,31 ---- * */ ! /* $Id: fdclsyn.h,v 1.250 1998/09/30 02:39:05 kimelman Exp $ */ #include "cmpdecl.h" #include "totdecl.h" *************** *** 50,56 **** /* 15 */ i4_t shtest1(struct des_lock *anl, char *con, i4_t size, struct des_lock *bl); /* snipc.c */ - /* 31 */ void main(i4_t argc, char **argv); /* 136 */ void answer_opusk(u2_t trnum, CPNM cpn); /* 165 */ char *getpage(u2_t trn, u2_t segn, u2_t pn); /* 215 */ void putpage(u2_t trn); --- 50,55 ---- diff -rc gnusql-0.7b6.0/src/engine/synch/incrs.c gnusql-0.7b6.1/src/engine/synch/incrs.c *** gnusql-0.7b6.0/src/engine/synch/incrs.c Tue Aug 18 01:37:30 1998 --- gnusql-0.7b6.1/src/engine/synch/incrs.c Tue Sep 29 17:25:14 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: incrs.c,v 1.247 1998/08/18 05:36:42 kimelman Exp $ */ #include "xmem.h" #include "dessnch.h" --- 25,31 ---- * */ ! /* $Id: incrs.c,v 1.248 1998/09/29 21:25:14 kimelman Exp $ */ #include "xmem.h" #include "dessnch.h" diff -rc gnusql-0.7b6.0/src/engine/synch/lock.c gnusql-0.7b6.1/src/engine/synch/lock.c *** gnusql-0.7b6.0/src/engine/synch/lock.c Thu Aug 20 13:39:26 1998 --- gnusql-0.7b6.1/src/engine/synch/lock.c Tue Sep 29 17:25:15 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: lock.c,v 1.247 1998/08/20 17:39:26 kimelman Exp $ */ #include "xmem.h" #include --- 25,31 ---- * */ ! /* $Id: lock.c,v 1.248 1998/09/29 21:25:15 kimelman Exp $ */ #include "xmem.h" #include diff -rc gnusql-0.7b6.0/src/engine/synch/sctpsyn.h gnusql-0.7b6.1/src/engine/synch/sctpsyn.h *** gnusql-0.7b6.0/src/engine/synch/sctpsyn.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/engine/synch/sctpsyn.h Tue Sep 29 17:25:15 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: sctpsyn.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #define NOTLOCK 0 /* no lock */ #define X_X 1 /* the whole range of a field exclusivly */ --- 25,31 ---- * */ ! /* $Id: sctpsyn.h,v 1.246 1998/09/29 21:25:15 kimelman Exp $ */ #define NOTLOCK 0 /* no lock */ #define X_X 1 /* the whole range of a field exclusivly */ diff -rc gnusql-0.7b6.0/src/engine/synch/shartest.c gnusql-0.7b6.1/src/engine/synch/shartest.c *** gnusql-0.7b6.0/src/engine/synch/shartest.c Tue Aug 18 01:37:31 1998 --- gnusql-0.7b6.1/src/engine/synch/shartest.c Tue Sep 29 17:25:16 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: shartest.c,v 1.248 1998/08/18 05:36:43 kimelman Exp $ */ #include "dessnch.h" #include "fdclsyn.h" --- 25,31 ---- * */ ! /* $Id: shartest.c,v 1.249 1998/09/29 21:25:16 kimelman Exp $ */ #include "dessnch.h" #include "fdclsyn.h" diff -rc gnusql-0.7b6.0/src/engine/synch/shtest1.c gnusql-0.7b6.1/src/engine/synch/shtest1.c *** gnusql-0.7b6.0/src/engine/synch/shtest1.c Wed May 20 01:51:31 1998 --- gnusql-0.7b6.1/src/engine/synch/shtest1.c Tue Sep 29 17:25:16 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: shtest1.c,v 1.246 1998/05/20 05:51:31 kml Exp $ */ #include "dessnch.h" --- 25,31 ---- * */ ! /* $Id: shtest1.c,v 1.247 1998/09/29 21:25:16 kimelman Exp $ */ #include "dessnch.h" diff -rc gnusql-0.7b6.0/src/engine/synch/snipc.c gnusql-0.7b6.1/src/engine/synch/snipc.c *** gnusql-0.7b6.0/src/engine/synch/snipc.c Mon Sep 28 02:09:26 1998 --- gnusql-0.7b6.1/src/engine/synch/snipc.c Tue Sep 29 22:39:06 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: snipc.c,v 1.251 1998/09/28 06:09:07 kimelman Exp $ */ #include "setup_os.h" #include --- 25,31 ---- * */ ! /* $Id: snipc.c,v 1.254 1998/09/30 02:39:06 kimelman Exp $ */ #include "setup_os.h" #include *************** *** 82,89 **** exit (0); } ! void ! main (i4_t argc, char **argv) { i4_t op =-1 , sz; key_t keysn, keybf; --- 82,89 ---- exit (0); } ! int ! main (int argc, char **argv) { i4_t op =-1 , sz; key_t keysn, keybf; *************** *** 159,164 **** --- 159,165 ---- syntime += tt; PRINTF(("SYN:::: rcv %d end \n",op)); } + return 0; } void diff -rc gnusql-0.7b6.0/src/engine/synch/synpr.c gnusql-0.7b6.1/src/engine/synch/synpr.c *** gnusql-0.7b6.0/src/engine/synch/synpr.c Tue Aug 18 01:37:31 1998 --- gnusql-0.7b6.1/src/engine/synch/synpr.c Tue Sep 29 17:25:17 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: synpr.c,v 1.248 1998/08/18 05:36:43 kimelman Exp $ */ #include "xmem.h" #include --- 25,31 ---- * */ ! /* $Id: synpr.c,v 1.249 1998/09/29 21:25:17 kimelman Exp $ */ #include "xmem.h" #include diff -rc gnusql-0.7b6.0/src/engine/synch/unlock.c gnusql-0.7b6.1/src/engine/synch/unlock.c *** gnusql-0.7b6.0/src/engine/synch/unlock.c Mon Sep 28 02:09:26 1998 --- gnusql-0.7b6.1/src/engine/synch/unlock.c Tue Sep 29 17:25:18 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: unlock.c,v 1.249 1998/09/28 06:08:20 kimelman Exp $ */ #include "setup_os.h" #include "dessnch.h" --- 25,31 ---- * */ ! /* $Id: unlock.c,v 1.250 1998/09/29 21:25:18 kimelman Exp $ */ #include "setup_os.h" #include "dessnch.h" diff -rc gnusql-0.7b6.0/src/engine/trans/Makefile.in gnusql-0.7b6.1/src/engine/trans/Makefile.in *** gnusql-0.7b6.0/src/engine/trans/Makefile.in Mon Sep 28 20:39:37 1998 --- gnusql-0.7b6.1/src/engine/trans/Makefile.in Tue Sep 29 17:25:18 1998 *************** *** 2,12 **** ## GNU SQL Transaction ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.249 1998/09/29 00:39:37 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Transaction ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.250 1998/09/29 21:25:18 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## *************** *** 62,67 **** --- 62,70 ---- $(IINC)/tptrn.h $(INC)/sql.h $(IINC)/fieldtp.h $(IINC)/deftr.h \ $(IINC)/totdecl.h $(IINC)/fdcltrn.h fdclsrt.h + fdcltrn.h : $(IINC)/inpop.h $(IINC)/f1f2decl.h + - touch $@ + addflds.o : addflds.c $(IINC)/strml.h aggravg.o : aggravg.c $(IINC)/sctp.h aggrifn.o : aggrifn.c $(IINC)/agrflg.h *************** *** 111,117 **** tmpob.o : tmpob.c dessrt.h fdclsrt.h trns.o : trns.c dessrt.h fdclsrt.h $(IINC)/inpop.h $(IINC)/strml.h \ $(IINC)/expop.h $(IINC)/totdecl.h ! fdcltrn.h : $(IINC)/inpop.h $(IINC)/f1f2decl.h cmpftn.o : cmpftn.c $(IINC)/cmpdecl.h $(IINC)/totdecl.h libtran.o : libtran.c $(IINC)/sctp.h $(IINC)/f1f2decl.h --- 114,120 ---- tmpob.o : tmpob.c dessrt.h fdclsrt.h trns.o : trns.c dessrt.h fdclsrt.h $(IINC)/inpop.h $(IINC)/strml.h \ $(IINC)/expop.h $(IINC)/totdecl.h ! cmpftn.o : cmpftn.c $(IINC)/cmpdecl.h $(IINC)/totdecl.h libtran.o : libtran.c $(IINC)/sctp.h $(IINC)/f1f2decl.h diff -rc gnusql-0.7b6.0/src/engine/trans/addflds.c gnusql-0.7b6.1/src/engine/trans/addflds.c *** gnusql-0.7b6.0/src/engine/trans/addflds.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/addflds.c Tue Sep 29 17:25:19 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: addflds.c,v 1.251 1998/05/20 05:52:42 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: addflds.c,v 1.252 1998/09/29 21:25:19 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/aggravg.c gnusql-0.7b6.1/src/engine/trans/aggravg.c *** gnusql-0.7b6.0/src/engine/trans/aggravg.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/aggravg.c Tue Sep 29 18:23:37 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: aggravg.c,v 1.252 1997/10/22 16:23:38 kml Exp $ */ #include --- 26,32 ---- * */ ! /* $Id: aggravg.c,v 1.254 1998/09/29 22:23:37 kimelman Exp $ */ #include *************** *** 220,240 **** if (v == 0) /* current == first */ res = (t == EQ || t == SES || t == SESE || t == SMLEQ || t == GRTEQ) ? OK : -ER_NCR; ! else ! if (v > 0) /* current > first */ if (BETWEEN_CMP) ! { ! v1 = cmpval (tuple_value, *sel_vals, field_type); *sel_vals = proval (*sel_vals, field_type); ! if (v1 == 0) /* current == last */ ! res = (t == SSE || t == SESE) ? OK : -ER_NCR; ! else ! res = (v1 > 0) ? -ER_NCR : OK; ! } else ! res = (t == NEQ || t == GRT || t == GRTEQ) ? OK : -ER_NCR; ! else /* current < first */ ! res = (t == SML || t == SMLEQ || t == NEQ) ? OK : -ER_NCR; return res; } --- 220,241 ---- if (v == 0) /* current == first */ res = (t == EQ || t == SES || t == SESE || t == SMLEQ || t == GRTEQ) ? OK : -ER_NCR; ! else if (v < 0) /* current < first */ ! res = (t == SML || t == SMLEQ || t == NEQ) ? OK : -ER_NCR; ! else /* current > first */ ! { if (BETWEEN_CMP) ! { ! v1 = cmpval (tuple_value, *sel_vals, field_type); *sel_vals = proval (*sel_vals, field_type); ! if (v1 == 0) /* current == last */ ! res = (t == SSE || t == SESE) ? OK : -ER_NCR; ! else ! res = (v1 > 0) ? -ER_NCR : OK; ! } else ! res = (t == NEQ || t == GRT || t == GRTEQ) ? OK : -ER_NCR; ! } return res; } *************** *** 263,273 **** for (sst = 1; (t = selsc1 (&selc, sst++)) != ENDSC && n < f_n; n++) { if ((pnt = arrpnt[n]) == NULL) /* NULL VALUE */ ! if(t != EQUN && t != ANY) ! return (0); ! else {} ! else ! if (fcv (t, (df + n)->field_type, &sel_vals, pnt) != OK) return (0); } return (tuple_size); --- 264,274 ---- for (sst = 1; (t = selsc1 (&selc, sst++)) != ENDSC && n < f_n; n++) { if ((pnt = arrpnt[n]) == NULL) /* NULL VALUE */ ! { ! if(t != EQUN && t != ANY) ! return (0); ! } ! else if (fcv (t, (df + n)->field_type, &sel_vals, pnt) != OK) return (0); } return (tuple_size); diff -rc gnusql-0.7b6.0/src/engine/trans/aggrifn.c gnusql-0.7b6.1/src/engine/trans/aggrifn.c *** gnusql-0.7b6.0/src/engine/trans/aggrifn.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/aggrifn.c Tue Sep 29 17:25:20 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: aggrifn.c,v 1.254 1998/05/20 05:52:42 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 27,33 ---- * */ ! /* $Id: aggrifn.c,v 1.255 1998/09/29 21:25:20 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/aggrsfn.c gnusql-0.7b6.1/src/engine/trans/aggrsfn.c *** gnusql-0.7b6.0/src/engine/trans/aggrsfn.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/aggrsfn.c Tue Sep 29 17:25:21 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: aggrsfn.c,v 1.254 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 27,33 ---- * */ ! /* $Id: aggrsfn.c,v 1.255 1998/09/29 21:25:21 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/bdunion.c gnusql-0.7b6.1/src/engine/trans/bdunion.c *** gnusql-0.7b6.0/src/engine/trans/bdunion.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/bdunion.c Tue Sep 29 17:25:21 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: bdunion.c,v 1.253 1998/05/20 05:52:42 kml Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: bdunion.c,v 1.254 1998/09/29 21:25:21 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/blfltr.c gnusql-0.7b6.1/src/engine/trans/blfltr.c *** gnusql-0.7b6.0/src/engine/trans/blfltr.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/blfltr.c Tue Sep 29 17:25:22 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: blfltr.c,v 1.251 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 27,33 ---- * */ ! /* $Id: blfltr.c,v 1.252 1998/09/29 21:25:22 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/cmpftn.c gnusql-0.7b6.1/src/engine/trans/cmpftn.c *** gnusql-0.7b6.0/src/engine/trans/cmpftn.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/cmpftn.c Tue Sep 29 17:25:22 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: cmpftn.c,v 1.249 1998/05/20 05:52:42 kml Exp $ */ #include #include "rnmtp.h" --- 25,31 ---- * */ ! /* $Id: cmpftn.c,v 1.250 1998/09/29 21:25:22 kimelman Exp $ */ #include #include "rnmtp.h" diff -rc gnusql-0.7b6.0/src/engine/trans/cmpkey.c gnusql-0.7b6.1/src/engine/trans/cmpkey.c *** gnusql-0.7b6.0/src/engine/trans/cmpkey.c Thu Oct 16 05:43:23 1997 --- gnusql-0.7b6.1/src/engine/trans/cmpkey.c Tue Sep 29 17:25:23 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: cmpkey.c,v 1.248 1997/10/16 09:43:23 vera Exp $ */ #include "dessrt.h" #include "pupsi.h" --- 25,31 ---- * */ ! /* $Id: cmpkey.c,v 1.249 1998/09/29 21:25:23 kimelman Exp $ */ #include "dessrt.h" #include "pupsi.h" diff -rc gnusql-0.7b6.0/src/engine/trans/cmpkeys.c gnusql-0.7b6.1/src/engine/trans/cmpkeys.c *** gnusql-0.7b6.0/src/engine/trans/cmpkeys.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/cmpkeys.c Tue Sep 29 17:25:23 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: cmpkeys.c,v 1.249 1998/05/20 05:52:42 kml Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: cmpkeys.c,v 1.250 1998/09/29 21:25:23 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/cntrid.c gnusql-0.7b6.1/src/engine/trans/cntrid.c *** gnusql-0.7b6.0/src/engine/trans/cntrid.c Thu Aug 20 20:28:15 1998 --- gnusql-0.7b6.1/src/engine/trans/cntrid.c Tue Sep 29 17:25:24 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: cntrid.c,v 1.251 1998/08/21 00:28:15 kimelman Exp $ */ #include "destrn.h" #include "sctp.h" --- 26,32 ---- * */ ! /* $Id: cntrid.c,v 1.252 1998/09/29 21:25:24 kimelman Exp $ */ #include "destrn.h" #include "sctp.h" diff -rc gnusql-0.7b6.0/src/engine/trans/cnttab.c gnusql-0.7b6.1/src/engine/trans/cnttab.c *** gnusql-0.7b6.0/src/engine/trans/cnttab.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/cnttab.c Tue Sep 29 17:25:24 1998 *************** *** 6,12 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 6,12 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 28,34 **** * */ ! /* $Id: cnttab.c,v 1.251 1998/05/20 05:52:42 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 28,34 ---- * */ ! /* $Id: cnttab.c,v 1.252 1998/09/29 21:25:24 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/crind.c gnusql-0.7b6.1/src/engine/trans/crind.c *** gnusql-0.7b6.0/src/engine/trans/crind.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/crind.c Tue Sep 29 17:25:24 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: crind.c,v 1.250 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: crind.c,v 1.251 1998/09/29 21:25:24 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/crrel.c gnusql-0.7b6.1/src/engine/trans/crrel.c *** gnusql-0.7b6.0/src/engine/trans/crrel.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/crrel.c Tue Sep 29 17:25:25 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: crrel.c,v 1.247 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: crrel.c,v 1.248 1998/09/29 21:25:25 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/crtfrm.c gnusql-0.7b6.1/src/engine/trans/crtfrm.c *** gnusql-0.7b6.0/src/engine/trans/crtfrm.c Tue Jan 13 07:22:19 1998 --- gnusql-0.7b6.1/src/engine/trans/crtfrm.c Tue Sep 29 17:25:25 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: crtfrm.c,v 1.248 1998/01/13 12:22:19 vera Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: crtfrm.c,v 1.249 1998/09/29 21:25:25 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/delcon.c gnusql-0.7b6.1/src/engine/trans/delcon.c *** gnusql-0.7b6.0/src/engine/trans/delcon.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/delcon.c Tue Sep 29 17:25:26 1998 *************** *** 6,12 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 6,12 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 28,34 **** * */ ! /* $Id: delcon.c,v 1.252 1998/05/20 05:52:42 kml Exp $ */ #include "destrn.h" #include "strml.h" --- 28,34 ---- * */ ! /* $Id: delcon.c,v 1.253 1998/09/29 21:25:26 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/delind.c gnusql-0.7b6.1/src/engine/trans/delind.c *** gnusql-0.7b6.0/src/engine/trans/delind.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/delind.c Tue Sep 29 17:25:26 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: delind.c,v 1.249 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: delind.c,v 1.250 1998/09/29 21:25:26 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/delrel.c gnusql-0.7b6.1/src/engine/trans/delrel.c *** gnusql-0.7b6.0/src/engine/trans/delrel.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/delrel.c Tue Sep 29 17:25:27 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: delrel.c,v 1.251 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: delrel.c,v 1.252 1998/09/29 21:25:27 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/dessrt.h gnusql-0.7b6.1/src/engine/trans/dessrt.h *** gnusql-0.7b6.0/src/engine/trans/dessrt.h Fri May 30 04:52:39 1997 --- gnusql-0.7b6.1/src/engine/trans/dessrt.h Tue Sep 29 17:25:27 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: dessrt.h,v 1.246 1997/05/30 08:52:39 vera Exp $ */ #include "destrn.h" --- 25,31 ---- * */ ! /* $Id: dessrt.h,v 1.247 1998/09/29 21:25:27 kimelman Exp $ */ #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/dltn.c gnusql-0.7b6.1/src/engine/trans/dltn.c *** gnusql-0.7b6.0/src/engine/trans/dltn.c Wed May 20 01:52:42 1998 --- gnusql-0.7b6.1/src/engine/trans/dltn.c Tue Sep 29 17:25:29 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: dltn.c,v 1.251 1998/05/20 05:52:42 kml Exp $ */ #include --- 26,32 ---- * */ ! /* $Id: dltn.c,v 1.252 1998/09/29 21:25:29 kimelman Exp $ */ #include diff -rc gnusql-0.7b6.0/src/engine/trans/empty_page.c gnusql-0.7b6.1/src/engine/trans/empty_page.c *** gnusql-0.7b6.0/src/engine/trans/empty_page.c Sun Jul 20 13:00:57 1997 --- gnusql-0.7b6.1/src/engine/trans/empty_page.c Tue Sep 29 17:25:29 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: empty_page.c,v 1.248 1997/07/20 17:00:57 vera Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: empty_page.c,v 1.249 1998/09/29 21:25:29 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/extsrt.c gnusql-0.7b6.1/src/engine/trans/extsrt.c *** gnusql-0.7b6.0/src/engine/trans/extsrt.c Tue Aug 19 15:18:40 1997 --- gnusql-0.7b6.1/src/engine/trans/extsrt.c Tue Sep 29 17:25:30 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: extsrt.c,v 1.247 1997/08/19 19:18:40 kml Exp $ */ #include "setup_os.h" --- 25,31 ---- * */ ! /* $Id: extsrt.c,v 1.248 1998/09/29 21:25:30 kimelman Exp $ */ #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/engine/trans/fdclsrt.h gnusql-0.7b6.1/src/engine/trans/fdclsrt.h *** gnusql-0.7b6.0/src/engine/trans/fdclsrt.h Thu Oct 16 05:46:47 1997 --- gnusql-0.7b6.1/src/engine/trans/fdclsrt.h Tue Sep 29 17:25:30 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: fdclsrt.h,v 1.247 1997/10/16 09:46:47 vera Exp $ */ #include "f1f2decl.h" /* cmpkey.c */ --- 25,31 ---- * */ ! /* $Id: fdclsrt.h,v 1.248 1998/09/29 21:25:30 kimelman Exp $ */ #include "f1f2decl.h" /* cmpkey.c */ diff -rc gnusql-0.7b6.0/src/engine/trans/fltrel.c gnusql-0.7b6.1/src/engine/trans/fltrel.c *** gnusql-0.7b6.0/src/engine/trans/fltrel.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/fltrel.c Tue Sep 29 17:25:31 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: fltrel.c,v 1.250 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: fltrel.c,v 1.251 1998/09/29 21:25:31 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/ind_ins.c gnusql-0.7b6.1/src/engine/trans/ind_ins.c *** gnusql-0.7b6.0/src/engine/trans/ind_ins.c Mon Sep 28 20:39:38 1998 --- gnusql-0.7b6.1/src/engine/trans/ind_ins.c Tue Sep 29 17:25:31 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: ind_ins.c,v 1.252 1998/09/29 00:39:38 kimelman Exp $ */ #include "xmem.h" #include --- 27,33 ---- * */ ! /* $Id: ind_ins.c,v 1.253 1998/09/29 21:25:31 kimelman Exp $ */ #include "xmem.h" #include diff -rc gnusql-0.7b6.0/src/engine/trans/ind_rem.c gnusql-0.7b6.1/src/engine/trans/ind_rem.c *** gnusql-0.7b6.0/src/engine/trans/ind_rem.c Mon Sep 28 20:39:38 1998 --- gnusql-0.7b6.1/src/engine/trans/ind_rem.c Tue Sep 29 17:25:32 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: ind_rem.c,v 1.251 1998/09/29 00:39:38 kimelman Exp $ */ #include "xmem.h" #include --- 27,33 ---- * */ ! /* $Id: ind_rem.c,v 1.252 1998/09/29 21:25:32 kimelman Exp $ */ #include "xmem.h" #include diff -rc gnusql-0.7b6.0/src/engine/trans/ind_scan.c gnusql-0.7b6.1/src/engine/trans/ind_scan.c *** gnusql-0.7b6.0/src/engine/trans/ind_scan.c Wed May 20 01:52:43 1998 --- gnusql-0.7b6.1/src/engine/trans/ind_scan.c Tue Sep 29 18:23:38 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: ind_scan.c,v 1.247 1998/05/20 05:52:43 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 27,33 ---- * */ ! /* $Id: ind_scan.c,v 1.249 1998/09/29 22:23:38 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" *************** *** 112,120 **** v1 = cmpval (kval, diaval, ftype); diaval = proval (diaval, ftype); if (v1 == 0) /* current == last */ ! if (t == SS || t == SES) ! return (EOI); ! else {} else if (v1 > 0) /* current > last */ return (EOI); } --- 112,121 ---- v1 = cmpval (kval, diaval, ftype); diaval = proval (diaval, ftype); if (v1 == 0) /* current == last */ ! { ! if (t == SS || t == SES) ! return (EOI); ! } else if (v1 > 0) /* current > last */ return (EOI); } diff -rc gnusql-0.7b6.0/src/engine/trans/inscon.c gnusql-0.7b6.1/src/engine/trans/inscon.c *** gnusql-0.7b6.0/src/engine/trans/inscon.c Wed May 20 01:52:43 1998 --- gnusql-0.7b6.1/src/engine/trans/inscon.c Tue Sep 29 18:23:39 1998 *************** *** 6,12 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 6,12 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 28,34 **** * */ ! /* $Id: inscon.c,v 1.251 1998/05/20 05:52:43 kml Exp $ */ #include "destrn.h" #include "strml.h" --- 28,34 ---- * */ ! /* $Id: inscon.c,v 1.253 1998/09/29 22:23:39 kimelman Exp $ */ #include "destrn.h" #include "strml.h" *************** *** 69,94 **** /*-------------------------------------------------------------*/ ! #define INSERTION_BY_TID(pn,ind) \ ! if (oldpn != pn)\ ! {\ ! putpg (&inpage, 'n');\ ! while ((asp = getpg (&inpage, sn_in, pn, 's')) == NULL);\ ! afi = (u2_t *) (asp + phsize);\ ! oldpn = pn;\ ! }\ ai = afi + ind; /*-------------------------------------------------------------*/ ! #define MASS_INSERTION \ ! if (*ai != 0 && CHECK_PG_ENTRY(ai))\ ! {\ ! if ((corsize = fndslc (dr_in, asp + *ai, sc,\ ! slsz, cort)) != 0)\ ! if (sn_out != NRSNUM)\ ! mins (cort, corsize, &outpage, &freesz, dr_out);\ ! else\ ! minstr (outasp, cort, corsize, dt);\ } /*-------------------------------------------------------------*/ --- 69,96 ---- /*-------------------------------------------------------------*/ ! #define INSERTION_BY_TID(pn,ind) \ ! if (oldpn != pn) \ ! { \ ! putpg (&inpage, 'n'); \ ! while ((asp = getpg (&inpage, sn_in, pn, 's')) == NULL); \ ! afi = (u2_t *) (asp + phsize); \ ! oldpn = pn; \ ! } \ ai = afi + ind; /*-------------------------------------------------------------*/ ! #define MASS_INSERTION \ ! if (*ai != 0 && CHECK_PG_ENTRY(ai)) \ ! { \ ! if ((corsize = fndslc (dr_in, asp + *ai, sc, \ ! slsz, cort)) != 0) \ ! { \ ! if (sn_out != NRSNUM) \ ! mins (cort, corsize, &outpage, &freesz, dr_out); \ ! else \ ! minstr (outasp, cort, corsize, dt); \ ! } \ } /*-------------------------------------------------------------*/ diff -rc gnusql-0.7b6.0/src/engine/trans/insfltr.c gnusql-0.7b6.1/src/engine/trans/insfltr.c *** gnusql-0.7b6.0/src/engine/trans/insfltr.c Wed May 20 01:52:43 1998 --- gnusql-0.7b6.1/src/engine/trans/insfltr.c Tue Sep 29 17:25:33 1998 *************** *** 2,12 **** * insfltr.c - Insertion into a filter * Kernel of GNU SQL-server * ! * $Id: insfltr.c,v 1.248 1998/05/20 05:52:43 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 2,12 ---- * insfltr.c - Insertion into a filter * Kernel of GNU SQL-server * ! * $Id: insfltr.c,v 1.249 1998/09/29 21:25:33 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * diff -rc gnusql-0.7b6.0/src/engine/trans/insrtn.c gnusql-0.7b6.1/src/engine/trans/insrtn.c *** gnusql-0.7b6.0/src/engine/trans/insrtn.c Tue Jan 20 00:14:55 1998 --- gnusql-0.7b6.1/src/engine/trans/insrtn.c Tue Sep 29 17:25:34 1998 *************** *** 2,12 **** * insrtn.c - Insertion operation * Kernel of GNU SQL-server * ! * $Id: insrtn.c,v 1.252 1998/01/20 05:14:55 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 2,12 ---- * insrtn.c - Insertion operation * Kernel of GNU SQL-server * ! * $Id: insrtn.c,v 1.253 1998/09/29 21:25:34 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * diff -rc gnusql-0.7b6.0/src/engine/trans/join.c gnusql-0.7b6.1/src/engine/trans/join.c *** gnusql-0.7b6.0/src/engine/trans/join.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/join.c Tue Sep 29 17:25:34 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: join.c,v 1.249 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: join.c,v 1.250 1998/09/29 21:25:34 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/keyfrm.c gnusql-0.7b6.1/src/engine/trans/keyfrm.c *** gnusql-0.7b6.0/src/engine/trans/keyfrm.c Thu Oct 16 05:50:06 1997 --- gnusql-0.7b6.1/src/engine/trans/keyfrm.c Tue Sep 29 17:25:35 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: keyfrm.c,v 1.247 1997/10/16 09:50:06 vera Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: keyfrm.c,v 1.248 1998/09/29 21:25:35 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/libtran.c gnusql-0.7b6.1/src/engine/trans/libtran.c *** gnusql-0.7b6.0/src/engine/trans/libtran.c Tue Aug 18 18:29:59 1998 --- gnusql-0.7b6.1/src/engine/trans/libtran.c Tue Sep 29 17:25:35 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: libtran.c,v 1.252 1998/08/18 22:29:59 kimelman Exp $ */ #include "xmem.h" --- 25,31 ---- * */ ! /* $Id: libtran.c,v 1.253 1998/09/29 21:25:35 kimelman Exp $ */ #include "xmem.h" diff -rc gnusql-0.7b6.0/src/engine/trans/makegr.c gnusql-0.7b6.1/src/engine/trans/makegr.c *** gnusql-0.7b6.0/src/engine/trans/makegr.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/makegr.c Tue Sep 29 17:25:36 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 27,33 **** * */ ! /* $Id: makegr.c,v 1.252 1997/10/22 16:23:38 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 27,33 ---- * */ ! /* $Id: makegr.c,v 1.253 1998/09/29 21:25:36 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/mdfctn.c gnusql-0.7b6.1/src/engine/trans/mdfctn.c *** gnusql-0.7b6.0/src/engine/trans/mdfctn.c Tue Jan 13 07:22:19 1998 --- gnusql-0.7b6.1/src/engine/trans/mdfctn.c Tue Sep 29 17:25:36 1998 *************** *** 2,12 **** * mdfctn.c - Modification * Kernel of GNU SQL-server * ! * $Id: mdfctn.c,v 1.251 1998/01/13 12:22:19 vera Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 2,12 ---- * mdfctn.c - Modification * Kernel of GNU SQL-server * ! * $Id: mdfctn.c,v 1.252 1998/09/29 21:25:36 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * diff -rc gnusql-0.7b6.0/src/engine/trans/modcon.c gnusql-0.7b6.1/src/engine/trans/modcon.c *** gnusql-0.7b6.0/src/engine/trans/modcon.c Wed May 20 01:52:43 1998 --- gnusql-0.7b6.1/src/engine/trans/modcon.c Tue Sep 29 17:25:37 1998 *************** *** 6,12 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 6,12 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 28,34 **** * */ ! /* $Id: modcon.c,v 1.253 1998/05/20 05:52:43 kml Exp $ */ #include "destrn.h" #include "strml.h" --- 28,34 ---- * */ ! /* $Id: modcon.c,v 1.254 1998/09/29 21:25:37 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/next.c gnusql-0.7b6.1/src/engine/trans/next.c *** gnusql-0.7b6.0/src/engine/trans/next.c Sat Sep 12 18:15:34 1998 --- gnusql-0.7b6.1/src/engine/trans/next.c Tue Sep 29 17:25:37 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: next.c,v 1.251 1998/09/12 22:15:13 kimelman Exp $ */ #include --- 26,32 ---- * */ ! /* $Id: next.c,v 1.252 1998/09/29 21:25:37 kimelman Exp $ */ #include diff -rc gnusql-0.7b6.0/src/engine/trans/obrind.c gnusql-0.7b6.1/src/engine/trans/obrind.c *** gnusql-0.7b6.0/src/engine/trans/obrind.c Mon Jun 1 11:03:42 1998 --- gnusql-0.7b6.1/src/engine/trans/obrind.c Tue Sep 29 17:25:38 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: obrind.c,v 1.250 1998/06/01 15:03:42 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: obrind.c,v 1.251 1998/09/29 21:25:38 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/opinpg.c gnusql-0.7b6.1/src/engine/trans/opinpg.c *** gnusql-0.7b6.0/src/engine/trans/opinpg.c Wed May 20 01:52:43 1998 --- gnusql-0.7b6.1/src/engine/trans/opinpg.c Tue Sep 29 17:25:38 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: opinpg.c,v 1.248 1998/05/20 05:52:43 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: opinpg.c,v 1.249 1998/09/29 21:25:38 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/opscfl.c gnusql-0.7b6.1/src/engine/trans/opscfl.c *** gnusql-0.7b6.0/src/engine/trans/opscfl.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/opscfl.c Tue Sep 29 17:25:39 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: opscfl.c,v 1.249 1997/10/22 16:23:38 kml Exp $ */ #include "fdcltrn.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: opscfl.c,v 1.250 1998/09/29 21:25:39 kimelman Exp $ */ #include "fdcltrn.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/opscin.c gnusql-0.7b6.1/src/engine/trans/opscin.c *** gnusql-0.7b6.0/src/engine/trans/opscin.c Wed May 20 01:52:43 1998 --- gnusql-0.7b6.1/src/engine/trans/opscin.c Tue Sep 29 17:25:39 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: opscin.c,v 1.249 1998/05/20 05:52:43 kml Exp $ */ #include "destrn.h" #include "sctp.h" --- 26,32 ---- * */ ! /* $Id: opscin.c,v 1.250 1998/09/29 21:25:39 kimelman Exp $ */ #include "destrn.h" #include "sctp.h" diff -rc gnusql-0.7b6.0/src/engine/trans/opscrl.c gnusql-0.7b6.1/src/engine/trans/opscrl.c *** gnusql-0.7b6.0/src/engine/trans/opscrl.c Wed Oct 22 12:23:38 1997 --- gnusql-0.7b6.1/src/engine/trans/opscrl.c Tue Sep 29 17:25:40 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: opscrl.c,v 1.249 1997/10/22 16:23:38 kml Exp $ */ #include "destrn.h" #include "sctp.h" --- 26,32 ---- * */ ! /* $Id: opscrl.c,v 1.250 1998/09/29 21:25:40 kimelman Exp $ */ #include "destrn.h" #include "sctp.h" diff -rc gnusql-0.7b6.0/src/engine/trans/orddel.c gnusql-0.7b6.1/src/engine/trans/orddel.c *** gnusql-0.7b6.0/src/engine/trans/orddel.c Sun Jul 20 13:00:57 1997 --- gnusql-0.7b6.1/src/engine/trans/orddel.c Tue Sep 29 21:39:10 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: orddel.c,v 1.249 1997/07/20 17:00:57 vera Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: orddel.c,v 1.252 1998/09/30 01:39:10 kimelman Exp $ */ #include "destrn.h" #include "strml.h" *************** *** 57,62 **** --- 57,63 ---- t = *tuple & MSKCORT; if (t == IND) { + oldsize = 0; ref_tid.tindex = t2bunpack (tuple + 1); ref_tid.tpn = t2bunpack (tuple + 1 + size2b); recmjform (OLD, &pg, *ai, MIN_TUPLE_LENGTH, tuple, 0); *************** *** 91,95 **** modrec (&fullrn, pn, MIN_TUPLE_LENGTH + size2b); } else ! modrec (&fullrn, pn, oldsize + size2b); } --- 92,99 ---- modrec (&fullrn, pn, MIN_TUPLE_LENGTH + size2b); } else ! { ! assert(oldsize > 0 ); ! modrec (&fullrn, pn, oldsize + size2b); ! } } diff -rc gnusql-0.7b6.0/src/engine/trans/ordins.c gnusql-0.7b6.1/src/engine/trans/ordins.c *** gnusql-0.7b6.0/src/engine/trans/ordins.c Mon Oct 20 06:55:09 1997 --- gnusql-0.7b6.1/src/engine/trans/ordins.c Tue Sep 29 17:25:41 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: ordins.c,v 1.250 1997/10/20 10:55:09 vera Exp $ */ #include #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: ordins.c,v 1.251 1998/09/29 21:25:41 kimelman Exp $ */ #include #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/ordmod.c gnusql-0.7b6.1/src/engine/trans/ordmod.c *** gnusql-0.7b6.0/src/engine/trans/ordmod.c Wed Oct 1 09:32:13 1997 --- gnusql-0.7b6.1/src/engine/trans/ordmod.c Tue Sep 29 17:25:41 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: ordmod.c,v 1.249 1997/10/01 13:32:13 vera Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: ordmod.c,v 1.250 1998/09/29 21:25:41 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/page_op.c gnusql-0.7b6.1/src/engine/trans/page_op.c *** gnusql-0.7b6.0/src/engine/trans/page_op.c Wed May 20 01:52:43 1998 --- gnusql-0.7b6.1/src/engine/trans/page_op.c Tue Sep 29 17:25:42 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: page_op.c,v 1.251 1998/05/20 05:52:43 kml Exp $ */ #include "setup_os.h" #include --- 26,32 ---- * */ ! /* $Id: page_op.c,v 1.252 1998/09/29 21:25:42 kimelman Exp $ */ #include "setup_os.h" #include diff -rc gnusql-0.7b6.0/src/engine/trans/proind.c gnusql-0.7b6.1/src/engine/trans/proind.c *** gnusql-0.7b6.0/src/engine/trans/proind.c Thu May 8 08:26:58 1997 --- gnusql-0.7b6.1/src/engine/trans/proind.c Tue Sep 29 17:25:42 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: proind.c,v 1.247 1997/05/08 12:26:58 vera Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: proind.c,v 1.248 1998/09/29 21:25:42 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/push.c gnusql-0.7b6.1/src/engine/trans/push.c *** gnusql-0.7b6.0/src/engine/trans/push.c Tue Aug 19 15:18:40 1997 --- gnusql-0.7b6.1/src/engine/trans/push.c Tue Sep 29 17:25:43 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: push.c,v 1.247 1997/08/19 19:18:40 kml Exp $ */ #include "setup_os.h" --- 26,32 ---- * */ ! /* $Id: push.c,v 1.248 1998/09/29 21:25:43 kimelman Exp $ */ #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/engine/trans/puts.c gnusql-0.7b6.1/src/engine/trans/puts.c *** gnusql-0.7b6.0/src/engine/trans/puts.c Tue Aug 19 15:18:40 1997 --- gnusql-0.7b6.1/src/engine/trans/puts.c Tue Sep 29 17:25:43 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: puts.c,v 1.247 1997/08/19 19:18:40 kml Exp $ */ #include "dessrt.h" #include "pupsi.h" --- 26,32 ---- * */ ! /* $Id: puts.c,v 1.248 1998/09/29 21:25:43 kimelman Exp $ */ #include "dessrt.h" #include "pupsi.h" diff -rc gnusql-0.7b6.0/src/engine/trans/quicksrt.c gnusql-0.7b6.1/src/engine/trans/quicksrt.c *** gnusql-0.7b6.0/src/engine/trans/quicksrt.c Tue Aug 19 15:18:40 1997 --- gnusql-0.7b6.1/src/engine/trans/quicksrt.c Tue Sep 29 17:25:44 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: quicksrt.c,v 1.247 1997/08/19 19:18:40 kml Exp $ */ #include "dessrt.h" #include "fdclsrt.h" --- 25,31 ---- * */ ! /* $Id: quicksrt.c,v 1.248 1998/09/29 21:25:44 kimelman Exp $ */ #include "dessrt.h" #include "fdclsrt.h" diff -rc gnusql-0.7b6.0/src/engine/trans/rdcort.c gnusql-0.7b6.1/src/engine/trans/rdcort.c *** gnusql-0.7b6.0/src/engine/trans/rdcort.c Thu May 8 08:26:58 1997 --- gnusql-0.7b6.1/src/engine/trans/rdcort.c Tue Sep 29 17:25:44 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: rdcort.c,v 1.249 1997/05/08 12:26:58 vera Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: rdcort.c,v 1.250 1998/09/29 21:25:44 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/reclj.c gnusql-0.7b6.1/src/engine/trans/reclj.c *** gnusql-0.7b6.0/src/engine/trans/reclj.c Sun Jul 20 13:00:57 1997 --- gnusql-0.7b6.1/src/engine/trans/reclj.c Tue Sep 29 17:25:44 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: reclj.c,v 1.247 1997/07/20 17:00:57 vera Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: reclj.c,v 1.248 1998/09/29 21:25:44 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/recmj.c gnusql-0.7b6.1/src/engine/trans/recmj.c *** gnusql-0.7b6.0/src/engine/trans/recmj.c Sun Jul 20 13:00:57 1997 --- gnusql-0.7b6.1/src/engine/trans/recmj.c Tue Sep 29 17:25:45 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: recmj.c,v 1.247 1997/07/20 17:00:57 vera Exp $ */ #include "destrn.h" #include "strml.h" --- 26,32 ---- * */ ! /* $Id: recmj.c,v 1.248 1998/09/29 21:25:45 kimelman Exp $ */ #include "destrn.h" #include "strml.h" diff -rc gnusql-0.7b6.0/src/engine/trans/rkfrm.c gnusql-0.7b6.1/src/engine/trans/rkfrm.c *** gnusql-0.7b6.0/src/engine/trans/rkfrm.c Tue Aug 19 15:18:40 1997 --- gnusql-0.7b6.1/src/engine/trans/rkfrm.c Tue Sep 29 17:25:45 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: rkfrm.c,v 1.247 1997/08/19 19:18:40 kml Exp $ */ #include #include "setup_os.h" --- 25,31 ---- * */ ! /* $Id: rkfrm.c,v 1.248 1998/09/29 21:25:45 kimelman Exp $ */ #include #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/engine/trans/rllbck.c gnusql-0.7b6.1/src/engine/trans/rllbck.c *** gnusql-0.7b6.0/src/engine/trans/rllbck.c Wed May 20 01:52:44 1998 --- gnusql-0.7b6.1/src/engine/trans/rllbck.c Tue Sep 29 17:25:46 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: rllbck.c,v 1.251 1998/05/20 05:52:44 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 25,31 ---- * */ ! /* $Id: rllbck.c,v 1.252 1998/09/29 21:25:46 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/rllbfn.c gnusql-0.7b6.1/src/engine/trans/rllbfn.c *** gnusql-0.7b6.0/src/engine/trans/rllbfn.c Sun Jul 20 13:00:57 1997 --- gnusql-0.7b6.1/src/engine/trans/rllbfn.c Tue Sep 29 17:25:46 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: rllbfn.c,v 1.252 1997/07/20 17:00:57 vera Exp $ */ #include "xmem.h" #include "destrn.h" --- 25,31 ---- * */ ! /* $Id: rllbfn.c,v 1.253 1998/09/29 21:25:46 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/snlock.c gnusql-0.7b6.1/src/engine/trans/snlock.c *** gnusql-0.7b6.0/src/engine/trans/snlock.c Tue Jan 13 07:22:19 1998 --- gnusql-0.7b6.1/src/engine/trans/snlock.c Tue Sep 29 17:25:47 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: snlock.c,v 1.247 1998/01/13 12:22:19 vera Exp $ */ #include "xmem.h" #include "destrn.h" --- 26,32 ---- * */ ! /* $Id: snlock.c,v 1.248 1998/09/29 21:25:47 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/sort.c gnusql-0.7b6.1/src/engine/trans/sort.c *** gnusql-0.7b6.0/src/engine/trans/sort.c Mon Nov 3 09:17:08 1997 --- gnusql-0.7b6.1/src/engine/trans/sort.c Tue Sep 29 17:25:47 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: sort.c,v 1.249 1997/11/03 14:17:08 vera Exp $ */ #include "setup_os.h" --- 26,32 ---- * */ ! /* $Id: sort.c,v 1.250 1998/09/29 21:25:47 kimelman Exp $ */ #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/engine/trans/tidsrt.c gnusql-0.7b6.1/src/engine/trans/tidsrt.c *** gnusql-0.7b6.0/src/engine/trans/tidsrt.c Mon Oct 20 06:55:43 1997 --- gnusql-0.7b6.1/src/engine/trans/tidsrt.c Tue Sep 29 17:25:48 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: tidsrt.c,v 1.248 1997/10/20 10:55:43 vera Exp $ */ #include "xmem.h" #include "dessrt.h" --- 25,31 ---- * */ ! /* $Id: tidsrt.c,v 1.249 1998/09/29 21:25:48 kimelman Exp $ */ #include "xmem.h" #include "dessrt.h" diff -rc gnusql-0.7b6.0/src/engine/trans/tmpob.c gnusql-0.7b6.1/src/engine/trans/tmpob.c *** gnusql-0.7b6.0/src/engine/trans/tmpob.c Wed May 20 01:52:44 1998 --- gnusql-0.7b6.1/src/engine/trans/tmpob.c Tue Sep 29 17:25:48 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: tmpob.c,v 1.253 1998/05/20 05:52:44 kml Exp $ */ #include "xmem.h" #include "destrn.h" --- 25,31 ---- * */ ! /* $Id: tmpob.c,v 1.254 1998/09/29 21:25:48 kimelman Exp $ */ #include "xmem.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/engine/trans/trns.c gnusql-0.7b6.1/src/engine/trans/trns.c *** gnusql-0.7b6.0/src/engine/trans/trns.c Mon Sep 28 20:39:39 1998 --- gnusql-0.7b6.1/src/engine/trans/trns.c Tue Sep 29 17:25:49 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: trns.c,v 1.256 1998/09/29 00:39:39 kimelman Exp $ */ #include "setup_os.h" #include "xmem.h" --- 25,31 ---- * */ ! /* $Id: trns.c,v 1.257 1998/09/29 21:25:49 kimelman Exp $ */ #include "setup_os.h" #include "xmem.h" diff -rc gnusql-0.7b6.0/src/engine/trans/trns_decl.c gnusql-0.7b6.1/src/engine/trans/trns_decl.c *** gnusql-0.7b6.0/src/engine/trans/trns_decl.c Mon Sep 28 20:39:39 1998 --- gnusql-0.7b6.1/src/engine/trans/trns_decl.c Tue Sep 29 17:25:49 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify *************** *** 25,31 **** * */ ! /* $Id: trns_decl.c,v 1.1 1998/09/29 00:39:39 kimelman Exp $ */ #include "setup_os.h" #include "destrn.h" --- 25,31 ---- * */ ! /* $Id: trns_decl.c,v 1.2 1998/09/29 21:25:49 kimelman Exp $ */ #include "setup_os.h" #include "destrn.h" diff -rc gnusql-0.7b6.0/src/include/Makefile.in gnusql-0.7b6.1/src/include/Makefile.in *** gnusql-0.7b6.0/src/include/Makefile.in Sun Sep 13 00:22:11 1998 --- gnusql-0.7b6.1/src/include/Makefile.in Tue Sep 29 17:25:50 1998 *************** *** 2,12 **** ## GNU SQL Compiler (include dependencies) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.252 1998/09/13 04:21:03 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (include dependencies) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.253 1998/09/29 21:25:50 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/include/cl_lib.h gnusql-0.7b6.1/src/include/cl_lib.h *** gnusql-0.7b6.0/src/include/cl_lib.h Mon Sep 28 01:12:57 1998 --- gnusql-0.7b6.1/src/include/cl_lib.h Tue Sep 29 22:00:19 1998 *************** *** 1,4 **** ! /* $Id: cl_lib.h,v 1.246 1998/07/30 03:23:36 kimelman Exp $ * * cl_lib.h - rpc client support library interface * of GNU SQL compiler --- 1,4 ---- ! /* $Id: cl_lib.h,v 1.247 1998/09/29 21:25:50 kimelman Exp $ * * cl_lib.h - rpc client support library interface * of GNU SQL compiler *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 26,31 **** --- 26,34 ---- * Contacts: gss@ispras.ru * * $Log: cl_lib.h,v $ + * Revision 1.247 1998/09/29 21:25:50 kimelman + * copyright years fixed + * * Revision 1.246 1998/07/30 03:23:36 kimelman * DIRECT_MODE * diff -rc gnusql-0.7b6.0/src/include/const.h gnusql-0.7b6.1/src/include/const.h *** gnusql-0.7b6.0/src/include/const.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/const.h Tue Sep 29 21:28:38 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva, 1994 * Modified by Michael Kimelman, 1996 --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva, 1994 * Modified by Michael Kimelman, 1996 *************** *** 30,36 **** #ifndef __const_h__ #define __const_h__ ! /* $Id: const.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #define BASE_DAT "db/base.dat" --- 30,36 ---- #ifndef __const_h__ #define __const_h__ ! /* $Id: const.h,v 1.246 1998/09/29 21:25:51 kimelman Exp $ */ #define BASE_DAT "db/base.dat" diff -rc gnusql-0.7b6.0/src/include/cycler.h gnusql-0.7b6.1/src/include/cycler.h *** gnusql-0.7b6.0/src/include/cycler.h Mon Sep 28 20:23:16 1998 --- gnusql-0.7b6.1/src/include/cycler.h Tue Sep 29 22:00:19 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: cycler.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __CYCLER_H__ #define __CYCLER_H__ --- 26,32 ---- * */ ! /* $Id: cycler.h,v 1.246 1998/09/29 21:25:51 kimelman Exp $ */ #ifndef __CYCLER_H__ #define __CYCLER_H__ diff -rc gnusql-0.7b6.0/src/include/dyn_funcs.h gnusql-0.7b6.1/src/include/dyn_funcs.h *** gnusql-0.7b6.0/src/include/dyn_funcs.h Mon Apr 21 10:29:41 1997 --- gnusql-0.7b6.1/src/include/dyn_funcs.h Tue Sep 29 17:25:52 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj, 1995 * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj, 1995 * *************** *** 29,35 **** #ifndef _DYN_FUNCS_H_ #define _DYN_FUNCS_H_ ! /* $Id: dyn_funcs.h,v 1.247 1997/04/21 14:29:41 kml Exp $ */ #include --- 29,35 ---- #ifndef _DYN_FUNCS_H_ #define _DYN_FUNCS_H_ ! /* $Id: dyn_funcs.h,v 1.248 1998/09/29 21:25:52 kimelman Exp $ */ #include Common subdirectories: gnusql-0.7b6.0/src/include/engine and gnusql-0.7b6.1/src/include/engine diff -rc gnusql-0.7b6.0/src/include/errors.h gnusql-0.7b6.1/src/include/errors.h *** gnusql-0.7b6.0/src/include/errors.h Wed Nov 5 11:01:20 1997 --- gnusql-0.7b6.1/src/include/errors.h Tue Sep 29 17:25:52 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 25,31 **** * */ ! /* $Id: errors.h,v 1.247 1997/11/05 16:01:20 kml Exp $ */ #ifdef DEF_ERR --- 25,31 ---- * */ ! /* $Id: errors.h,v 1.248 1998/09/29 21:25:52 kimelman Exp $ */ #ifdef DEF_ERR diff -rc gnusql-0.7b6.0/src/include/exti.h gnusql-0.7b6.1/src/include/exti.h *** gnusql-0.7b6.0/src/include/exti.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/exti.h Tue Sep 29 17:25:53 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify *************** *** 24,30 **** * Contacts: gss@ispras.ru */ ! /* $Id: exti.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __exti_h__ #define __exti_h__ --- 24,30 ---- * Contacts: gss@ispras.ru */ ! /* $Id: exti.h,v 1.246 1998/09/29 21:25:53 kimelman Exp $ */ #ifndef __exti_h__ #define __exti_h__ diff -rc gnusql-0.7b6.0/src/include/funall.h gnusql-0.7b6.1/src/include/funall.h *** gnusql-0.7b6.0/src/include/funall.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/funall.h Tue Sep 29 22:00:19 1998 *************** *** 9,15 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify --- 9,15 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify *************** *** 29,35 **** * Contacts: gss@ispras.ru */ ! /* $Id: funall.h,v 1.247 1998/01/13 12:25:57 vera Exp $ */ /**********************************************************/ /* engine interface library */ --- 29,35 ---- * Contacts: gss@ispras.ru */ ! /* $Id: funall.h,v 1.248 1998/09/29 21:25:53 kimelman Exp $ */ /**********************************************************/ /* engine interface library */ diff -rc gnusql-0.7b6.0/src/include/global.h gnusql-0.7b6.1/src/include/global.h *** gnusql-0.7b6.0/src/include/global.h Mon Sep 28 20:23:16 1998 --- gnusql-0.7b6.1/src/include/global.h Tue Sep 29 22:00:19 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: global.h,v 1.246 1998/05/20 05:55:31 kml Exp $ */ #ifndef __GLOBAL_H__ #define __GLOBAL_H__ --- 25,31 ---- * */ ! /* $Id: global.h,v 1.247 1998/09/29 21:25:54 kimelman Exp $ */ #ifndef __GLOBAL_H__ #define __GLOBAL_H__ diff -rc gnusql-0.7b6.0/src/include/inprtyp.h gnusql-0.7b6.1/src/include/inprtyp.h *** gnusql-0.7b6.0/src/include/inprtyp.h Mon Sep 28 20:23:16 1998 --- gnusql-0.7b6.1/src/include/inprtyp.h Tue Sep 29 22:00:19 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 26,32 **** * */ ! /* $Id: inprtyp.h,v 1.246 1997/11/05 16:02:56 kml Exp $ */ #ifndef __intprtyp_h__ #define __intprtyp_h__ --- 26,32 ---- * */ ! /* $Id: inprtyp.h,v 1.247 1998/09/29 21:25:54 kimelman Exp $ */ #ifndef __intprtyp_h__ #define __intprtyp_h__ diff -rc gnusql-0.7b6.0/src/include/kitty.h gnusql-0.7b6.1/src/include/kitty.h *** gnusql-0.7b6.0/src/include/kitty.h Mon Sep 28 20:23:16 1998 --- gnusql-0.7b6.1/src/include/kitty.h Tue Sep 29 22:00:19 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin * *************** *** 24,30 **** * Contacts: gss@ispras.ru */ ! /* $Id: kitty.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __KITTY_H__ #define __KITTY_H__ --- 24,30 ---- * Contacts: gss@ispras.ru */ ! /* $Id: kitty.h,v 1.246 1998/09/29 21:25:55 kimelman Exp $ */ #ifndef __KITTY_H__ #define __KITTY_H__ diff -rc gnusql-0.7b6.0/src/include/options.def gnusql-0.7b6.1/src/include/options.def *** gnusql-0.7b6.0/src/include/options.def Sat Sep 12 18:03:26 1998 --- gnusql-0.7b6.1/src/include/options.def Tue Sep 29 17:25:55 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify *************** *** 24,30 **** * */ ! /* $Id: options.def,v 1.246 1998/09/12 21:46:04 kimelman Exp $ */ #ifdef DEF_OPTION /* DEF_OPTION("option name",reference_name, is setted) --- 24,30 ---- * */ ! /* $Id: options.def,v 1.247 1998/09/29 21:25:55 kimelman Exp $ */ #ifdef DEF_OPTION /* DEF_OPTION("option name",reference_name, is setted) diff -rc gnusql-0.7b6.0/src/include/pr_glob.h gnusql-0.7b6.1/src/include/pr_glob.h *** gnusql-0.7b6.0/src/include/pr_glob.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/pr_glob.h Tue Sep 29 22:00:19 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 27,33 **** * */ ! /* $Id: pr_glob.h,v 1.247 1997/11/05 16:03:16 kml Exp $ */ #ifndef __PR_GLOB_H__ #define __PR_GLOB_H__ --- 27,33 ---- * */ ! /* $Id: pr_glob.h,v 1.248 1998/09/29 21:25:55 kimelman Exp $ */ #ifndef __PR_GLOB_H__ #define __PR_GLOB_H__ diff -rc gnusql-0.7b6.0/src/include/setup_os.h gnusql-0.7b6.1/src/include/setup_os.h *** gnusql-0.7b6.0/src/include/setup_os.h Mon Sep 21 17:56:24 1998 --- gnusql-0.7b6.1/src/include/setup_os.h Tue Sep 29 22:00:17 1998 *************** *** 1,4 **** ! /* $Id: setup_os.h,v 1.219 1998/08/21 00:29:13 kimelman Exp $ * * setup_os.h - setup global directives to current operating system * and program environment --- 1,4 ---- ! /* $Id: setup_os.h,v 1.220 1998/09/29 21:25:56 kimelman Exp $ * * setup_os.h - setup global directives to current operating system * and program environment *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 26,31 **** --- 26,34 ---- * Contacts: gss@ispras.ru * * $Log: setup_os.h,v $ + * Revision 1.220 1998/09/29 21:25:56 kimelman + * copyright years fixed + * * Revision 1.219 1998/08/21 00:29:13 kimelman * fix:SVC_UNREG for direct mode * diff -rc gnusql-0.7b6.0/src/include/sql.h gnusql-0.7b6.1/src/include/sql.h *** gnusql-0.7b6.0/src/include/sql.h Mon Apr 21 10:27:03 1997 --- gnusql-0.7b6.1/src/include/sql.h Tue Sep 29 17:19:28 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify diff -rc gnusql-0.7b6.0/src/include/sql_decl.h gnusql-0.7b6.1/src/include/sql_decl.h *** gnusql-0.7b6.0/src/include/sql_decl.h Mon Sep 28 20:23:16 1998 --- gnusql-0.7b6.1/src/include/sql_decl.h Tue Sep 29 21:28:38 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 24,30 **** * Contacts: gss@ispras.ru */ ! /* $Id: sql_decl.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __SQL_DECL_H__ #define __SQL_DECL_H__ --- 24,30 ---- * Contacts: gss@ispras.ru */ ! /* $Id: sql_decl.h,v 1.246 1998/09/29 21:25:57 kimelman Exp $ */ #ifndef __SQL_DECL_H__ #define __SQL_DECL_H__ diff -rc gnusql-0.7b6.0/src/include/sql_type.def gnusql-0.7b6.1/src/include/sql_type.def *** gnusql-0.7b6.0/src/include/sql_type.def Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/sql_type.def Tue Sep 29 17:25:57 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: sql_type.def,v 1.245 1997/03/31 03:46:38 kml Exp $ */ /*************************************************************************\ * Each used by compiler SQL type has to be described here in the * --- 25,31 ---- * */ ! /* $Id: sql_type.def,v 1.246 1998/09/29 21:25:57 kimelman Exp $ */ /*************************************************************************\ * Each used by compiler SQL type has to be described here in the * diff -rc gnusql-0.7b6.0/src/include/sql_type.h gnusql-0.7b6.1/src/include/sql_type.h *** gnusql-0.7b6.0/src/include/sql_type.h Mon Mar 31 06:04:06 1997 --- gnusql-0.7b6.1/src/include/sql_type.h Tue Sep 29 17:25:58 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: sql_type.h,v 1.246 1997/03/31 11:04:06 kml Exp $ */ #ifndef __SQL_TYPE_H__ #define __SQL_TYPE_H__ --- 25,31 ---- * */ ! /* $Id: sql_type.h,v 1.247 1998/09/29 21:25:58 kimelman Exp $ */ #ifndef __SQL_TYPE_H__ #define __SQL_TYPE_H__ diff -rc gnusql-0.7b6.0/src/include/svr_lib.h gnusql-0.7b6.1/src/include/svr_lib.h *** gnusql-0.7b6.0/src/include/svr_lib.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/svr_lib.h Tue Sep 29 17:25:58 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 30,36 **** #ifndef __SVR_LIB_H__ #define __SVR_LIB_H__ ! /* $Id: svr_lib.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "gsqltrn.h" --- 30,36 ---- #ifndef __SVR_LIB_H__ #define __SVR_LIB_H__ ! /* $Id: svr_lib.h,v 1.246 1998/09/29 21:25:58 kimelman Exp $ */ #include "gsqltrn.h" diff -rc gnusql-0.7b6.0/src/include/tree_gen.h gnusql-0.7b6.1/src/include/tree_gen.h *** gnusql-0.7b6.0/src/include/tree_gen.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/tree_gen.h Tue Sep 29 17:25:58 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman, 1992 * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman, 1992 * *************** *** 26,32 **** * */ ! /* $Id: tree_gen.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __TREE_GEN_H__ --- 26,32 ---- * */ ! /* $Id: tree_gen.h,v 1.246 1998/09/29 21:25:58 kimelman Exp $ */ #ifndef __TREE_GEN_H__ diff -rc gnusql-0.7b6.0/src/include/type.h gnusql-0.7b6.1/src/include/type.h *** gnusql-0.7b6.0/src/include/type.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/type.h Tue Sep 29 22:00:19 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 26,32 **** * */ ! /* $Id: type.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __TYPE_H__ #define __TYPE_H__ --- 26,32 ---- * */ ! /* $Id: type.h,v 1.246 1998/09/29 21:25:59 kimelman Exp $ */ #ifndef __TYPE_H__ #define __TYPE_H__ diff -rc gnusql-0.7b6.0/src/include/type_lib.h gnusql-0.7b6.1/src/include/type_lib.h *** gnusql-0.7b6.0/src/include/type_lib.h Mon Sep 28 20:23:16 1998 --- gnusql-0.7b6.1/src/include/type_lib.h Tue Sep 29 22:00:19 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: type_lib.h,v 1.247 1997/11/05 16:04:29 kml Exp $ */ #ifndef __TYPE_LIB_H__ #define __TYPE_LIB_H__ --- 25,31 ---- * */ ! /* $Id: type_lib.h,v 1.248 1998/09/29 21:25:59 kimelman Exp $ */ #ifndef __TYPE_LIB_H__ #define __TYPE_LIB_H__ diff -rc gnusql-0.7b6.0/src/include/typecpi.h gnusql-0.7b6.1/src/include/typecpi.h *** gnusql-0.7b6.0/src/include/typecpi.h Tue Aug 11 09:56:54 1998 --- gnusql-0.7b6.1/src/include/typecpi.h Tue Sep 29 21:28:38 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * diff -rc gnusql-0.7b6.0/src/include/typeif.h gnusql-0.7b6.1/src/include/typeif.h *** gnusql-0.7b6.0/src/include/typeif.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/typeif.h Tue Sep 29 21:28:38 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Olga Dmitrieva * *************** *** 26,32 **** * */ ! /* $Id: typeif.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __TYPEIF__ #define __TYPEIF__ --- 26,32 ---- * */ ! /* $Id: typeif.h,v 1.246 1998/09/29 21:26:00 kimelman Exp $ */ #ifndef __TYPEIF__ #define __TYPEIF__ diff -rc gnusql-0.7b6.0/src/include/typepi.h gnusql-0.7b6.1/src/include/typepi.h *** gnusql-0.7b6.0/src/include/typepi.h Tue Aug 11 09:56:54 1998 --- gnusql-0.7b6.1/src/include/typepi.h Tue Sep 29 21:28:38 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 26,32 **** * */ ! /* $Id: typepi.h,v 1.246 1997/11/05 16:04:55 kml Exp $ */ #ifndef __TYPEPI_H__ #define __TYPEPI_H__ --- 26,32 ---- * */ ! /* $Id: typepi.h,v 1.247 1998/09/29 21:26:01 kimelman Exp $ */ #ifndef __TYPEPI_H__ #define __TYPEPI_H__ diff -rc gnusql-0.7b6.0/src/include/vmemory.h gnusql-0.7b6.1/src/include/vmemory.h *** gnusql-0.7b6.0/src/include/vmemory.h Mon Mar 31 06:03:59 1997 --- gnusql-0.7b6.1/src/include/vmemory.h Tue Sep 29 17:26:01 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: vmemory.h,v 1.246 1997/03/31 11:03:59 kml Exp $ */ /*===================================================================== --- 26,32 ---- * */ ! /* $Id: vmemory.h,v 1.247 1998/09/29 21:26:01 kimelman Exp $ */ /*===================================================================== diff -rc gnusql-0.7b6.0/src/include/xmem.h gnusql-0.7b6.1/src/include/xmem.h *** gnusql-0.7b6.0/src/include/xmem.h Mon Sep 21 17:56:24 1998 --- gnusql-0.7b6.1/src/include/xmem.h Tue Sep 29 22:00:17 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * This code extracted from GNU CC and partially modified by Michael Kimelman * * This program is free software; you can redistribute it and/or modify --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * This code extracted from GNU CC and partially modified by Michael Kimelman * * This program is free software; you can redistribute it and/or modify *************** *** 28,34 **** #ifndef __XMEM_H__ #define __XMEM_H__ ! /* $Id: xmem.h,v 1.247 1997/04/24 17:42:06 kml Exp $ */ #include "setup_os.h" #include --- 28,34 ---- #ifndef __XMEM_H__ #define __XMEM_H__ ! /* $Id: xmem.h,v 1.248 1998/09/29 21:26:01 kimelman Exp $ */ #include "setup_os.h" #include diff -rc gnusql-0.7b6.0/src/include/engine/Makefile.in gnusql-0.7b6.1/src/include/engine/Makefile.in *** gnusql-0.7b6.0/src/include/engine/Makefile.in Sat Sep 12 23:31:43 1998 --- gnusql-0.7b6.1/src/include/engine/Makefile.in Tue Sep 29 17:26:02 1998 *************** *** 2,12 **** ## GNU SQL Engine (include dependencies) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.248 1998/09/13 03:30:34 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Engine (include dependencies) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.249 1998/09/29 21:26:02 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/include/engine/adfstr.h gnusql-0.7b6.1/src/include/engine/adfstr.h *** gnusql-0.7b6.0/src/include/engine/adfstr.h Sun Jul 20 12:55:38 1997 --- gnusql-0.7b6.1/src/include/engine/adfstr.h Tue Sep 29 17:26:02 1998 *************** *** 2,12 **** * adfstr.h - the structure of administrative file * Kernel of GNU SQL-server * ! * $Id: adfstr.h,v 1.246 1997/07/20 16:55:38 vera Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 2,12 ---- * adfstr.h - the structure of administrative file * Kernel of GNU SQL-server * ! * $Id: adfstr.h,v 1.247 1998/09/29 21:26:02 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * diff -rc gnusql-0.7b6.0/src/include/engine/agrflg.h gnusql-0.7b6.1/src/include/engine/agrflg.h *** gnusql-0.7b6.0/src/include/engine/agrflg.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/engine/agrflg.h Tue Sep 29 17:26:04 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 25,31 **** * */ ! /* $Id: agrflg.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __agrflg_H__ #define __agrflg_H__ --- 25,31 ---- * */ ! /* $Id: agrflg.h,v 1.246 1998/09/29 21:26:04 kimelman Exp $ */ #ifndef __agrflg_H__ #define __agrflg_H__ diff -rc gnusql-0.7b6.0/src/include/engine/deftr.h gnusql-0.7b6.1/src/include/engine/deftr.h *** gnusql-0.7b6.0/src/include/engine/deftr.h Wed Nov 5 11:00:31 1997 --- gnusql-0.7b6.1/src/include/engine/deftr.h Tue Sep 29 17:26:04 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 29,35 **** #ifndef __deftr_h__ #define __deftr_h__ ! /* $Id: deftr.h,v 1.247 1997/11/05 16:00:31 kml Exp $ */ /*#ifndef __PR_GLOB_H__*/ --- 29,35 ---- #ifndef __deftr_h__ #define __deftr_h__ ! /* $Id: deftr.h,v 1.248 1998/09/29 21:26:04 kimelman Exp $ */ /*#ifndef __PR_GLOB_H__*/ diff -rc gnusql-0.7b6.0/src/include/engine/destrn.h gnusql-0.7b6.1/src/include/engine/destrn.h *** gnusql-0.7b6.0/src/include/engine/destrn.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/engine/destrn.h Tue Sep 29 22:00:17 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 29,35 **** #ifndef __destrn_h__ #define __destrn_h__ ! /* $Id: destrn.h,v 1.247 1997/10/21 16:45:26 kml Exp $ */ #include #include "rnmtp.h" --- 29,35 ---- #ifndef __destrn_h__ #define __destrn_h__ ! /* $Id: destrn.h,v 1.248 1998/09/29 21:26:05 kimelman Exp $ */ #include #include "rnmtp.h" diff -rc gnusql-0.7b6.0/src/include/engine/expop.h gnusql-0.7b6.1/src/include/engine/expop.h *** gnusql-0.7b6.0/src/include/engine/expop.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/engine/expop.h Tue Sep 29 17:26:05 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 28,34 **** #ifndef __expop_h__ #define __expop_h__ ! /* $Id: expop.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ enum { --- 28,34 ---- #ifndef __expop_h__ #define __expop_h__ ! /* $Id: expop.h,v 1.246 1998/09/29 21:26:05 kimelman Exp $ */ enum { diff -rc gnusql-0.7b6.0/src/include/engine/f1f2decl.h gnusql-0.7b6.1/src/include/engine/f1f2decl.h *** gnusql-0.7b6.0/src/include/engine/f1f2decl.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/engine/f1f2decl.h Tue Sep 29 22:00:18 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 29,35 **** #ifndef __f1f2decl_h__ #define __f1f2decl_h__ ! /* $Id: f1f2decl.h,v 1.247 1997/07/20 16:55:38 vera Exp $ */ #include "totdecl.h" #include "cmpdecl.h" --- 29,35 ---- #ifndef __f1f2decl_h__ #define __f1f2decl_h__ ! /* $Id: f1f2decl.h,v 1.248 1998/09/29 21:26:06 kimelman Exp $ */ #include "totdecl.h" #include "cmpdecl.h" diff -rc gnusql-0.7b6.0/src/include/engine/fdcltrn.h gnusql-0.7b6.1/src/include/engine/fdcltrn.h *** gnusql-0.7b6.0/src/include/engine/fdcltrn.h Mon Sep 28 20:30:02 1998 --- gnusql-0.7b6.1/src/include/engine/fdcltrn.h Tue Sep 29 22:00:51 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 29,35 **** #ifndef __fdcltrn_h__ #define __fdcltrn_h__ ! /* $Id: fdcltrn.h,v 1.257 1998/06/01 15:03:47 kimelman Exp $ */ #include "inpop.h" #include "f1f2decl.h" --- 29,35 ---- #ifndef __fdcltrn_h__ #define __fdcltrn_h__ ! /* $Id: fdcltrn.h,v 1.258 1998/09/29 21:26:06 kimelman Exp $ */ #include "inpop.h" #include "f1f2decl.h" diff -rc gnusql-0.7b6.0/src/include/engine/fieldtp.h gnusql-0.7b6.1/src/include/engine/fieldtp.h *** gnusql-0.7b6.0/src/include/engine/fieldtp.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/engine/fieldtp.h Tue Sep 29 17:26:07 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 28,34 **** #ifndef __fieldtp_h__ #define __fieldtp_h__ ! /* $Id: fieldtp.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ enum { --- 28,34 ---- #ifndef __fieldtp_h__ #define __fieldtp_h__ ! /* $Id: fieldtp.h,v 1.246 1998/09/29 21:26:07 kimelman Exp $ */ enum { diff -rc gnusql-0.7b6.0/src/include/engine/inpop.h gnusql-0.7b6.1/src/include/engine/inpop.h *** gnusql-0.7b6.0/src/include/engine/inpop.h Tue Feb 24 18:37:36 1998 --- gnusql-0.7b6.1/src/include/engine/inpop.h Tue Sep 29 21:28:37 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * diff -rc gnusql-0.7b6.0/src/include/engine/pupsi.h gnusql-0.7b6.1/src/include/engine/pupsi.h *** gnusql-0.7b6.0/src/include/engine/pupsi.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/engine/pupsi.h Tue Sep 29 17:26:08 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 30,36 **** #ifndef __PUPSI_H__ #define __PUPSI_H__ ! /* $Id: pupsi.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #define BD_PAGESIZE 1024 --- 30,36 ---- #ifndef __PUPSI_H__ #define __PUPSI_H__ ! /* $Id: pupsi.h,v 1.246 1998/09/29 21:26:08 kimelman Exp $ */ #define BD_PAGESIZE 1024 diff -rc gnusql-0.7b6.0/src/include/engine/sctp.h gnusql-0.7b6.1/src/include/engine/sctp.h *** gnusql-0.7b6.0/src/include/engine/sctp.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/include/engine/sctp.h Tue Sep 29 17:26:08 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 28,34 **** #ifndef __sctp_H__ #define __sctp_H__ ! /* $Id: sctp.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ typedef enum { EQ = 1 /* = */, --- 28,34 ---- #ifndef __sctp_H__ #define __sctp_H__ ! /* $Id: sctp.h,v 1.246 1998/09/29 21:26:08 kimelman Exp $ */ typedef enum { EQ = 1 /* = */, diff -rc gnusql-0.7b6.0/src/include/engine/strml.h gnusql-0.7b6.1/src/include/engine/strml.h *** gnusql-0.7b6.0/src/include/engine/strml.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/engine/strml.h Tue Sep 29 22:00:18 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 26,32 **** * */ ! /* $Id: strml.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __STRML_H__ #define __STRML_H__ --- 26,32 ---- * */ ! /* $Id: strml.h,v 1.246 1998/09/29 21:26:08 kimelman Exp $ */ #ifndef __STRML_H__ #define __STRML_H__ diff -rc gnusql-0.7b6.0/src/include/engine/totdecl.h gnusql-0.7b6.1/src/include/engine/totdecl.h *** gnusql-0.7b6.0/src/include/engine/totdecl.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/engine/totdecl.h Tue Sep 29 22:00:17 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Vera Ponomarenko * *************** *** 24,30 **** * * Contacts: gss@ispras.ru * ! * $Id: totdecl.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __TOTFTN_H__ --- 24,30 ---- * * Contacts: gss@ispras.ru * ! * $Id: totdecl.h,v 1.246 1998/09/29 21:26:10 kimelman Exp $ */ #ifndef __TOTFTN_H__ diff -rc gnusql-0.7b6.0/src/include/engine/tptrn.h gnusql-0.7b6.1/src/include/engine/tptrn.h *** gnusql-0.7b6.0/src/include/engine/tptrn.h Mon Sep 21 17:56:25 1998 --- gnusql-0.7b6.1/src/include/engine/tptrn.h Tue Sep 29 22:00:17 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of[ ]System Programming * This file is written by Vera Ponomarenko * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of[ ]System Programming * This file is written by Vera Ponomarenko * *************** *** 29,35 **** #ifndef __TPTRN_H__ #define __TPTRN_H__ ! /* $Id: tptrn.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "engine/rnmtp.h" --- 29,35 ---- #ifndef __TPTRN_H__ #define __TPTRN_H__ ! /* $Id: tptrn.h,v 1.246 1998/09/29 21:26:10 kimelman Exp $ */ #include "engine/rnmtp.h" diff -rc gnusql-0.7b6.0/src/interpr/Makefile.in gnusql-0.7b6.1/src/interpr/Makefile.in *** gnusql-0.7b6.0/src/interpr/Makefile.in Mon Sep 28 02:09:28 1998 --- gnusql-0.7b6.1/src/interpr/Makefile.in Tue Sep 29 17:26:11 1998 *************** *** 2,12 **** ## GNU SQL Compiler (interpretator) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.246 1998/09/28 06:03:06 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (interpretator) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.247 1998/09/29 21:26:11 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/interpr/int_cli.c gnusql-0.7b6.1/src/interpr/int_cli.c *** gnusql-0.7b6.0/src/interpr/int_cli.c Wed Jul 29 23:23:37 1998 --- gnusql-0.7b6.1/src/interpr/int_cli.c Tue Sep 29 17:26:11 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: int_cli.c,v 1.249 1998/07/30 03:23:37 kimelman Exp $ */ #include "setup_os.h" #if HAVE_UNISTD_H --- 25,31 ---- * */ ! /* $Id: int_cli.c,v 1.250 1998/09/29 21:26:11 kimelman Exp $ */ #include "setup_os.h" #if HAVE_UNISTD_H diff -rc gnusql-0.7b6.0/src/interpr/int_servlib.c gnusql-0.7b6.1/src/interpr/int_servlib.c *** gnusql-0.7b6.0/src/interpr/int_servlib.c Tue Jan 13 07:26:26 1998 --- gnusql-0.7b6.1/src/interpr/int_servlib.c Tue Sep 29 17:26:12 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * *************** *** 25,31 **** * */ ! /* $Id: int_servlib.c,v 1.249 1998/01/13 12:26:26 vera Exp $ */ #include "global.h" #include "gsqltrn.h" --- 25,31 ---- * */ ! /* $Id: int_servlib.c,v 1.250 1998/09/29 21:26:12 kimelman Exp $ */ #include "global.h" #include "gsqltrn.h" diff -rc gnusql-0.7b6.0/src/interpr/interpr.c gnusql-0.7b6.1/src/interpr/interpr.c *** gnusql-0.7b6.0/src/interpr/interpr.c Wed May 20 01:56:04 1998 --- gnusql-0.7b6.1/src/interpr/interpr.c Tue Sep 29 18:23:40 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: interpr.c,v 1.249 1998/05/20 05:56:04 kml Exp $ */ /* in values of type PSECT_PTR always : .adr=NULL <==> .off==VNULL */ /* If there is a SavePar command, it must be the first command of section */ --- 25,31 ---- * */ ! /* $Id: interpr.c,v 1.251 1998/09/29 22:23:40 kimelman Exp $ */ /* in values of type PSECT_PTR always : .adr=NULL <==> .off==VNULL */ /* If there is a SavePar command, it must be the first command of section */ *************** *** 456,465 **** /* PRET->ExitFlag == FALSE => operator SELECT */ if (!PRET->ExitFlag) ! if (!retpar_done_fl) ! retpar_done_fl++; ! else /* one row was already extracted */ ! CHECK_ERR (-ER_SEL); cnt_res = PRET->OutNum; if (res_hole_cnt < cnt_res) --- 456,467 ---- /* PRET->ExitFlag == FALSE => operator SELECT */ if (!PRET->ExitFlag) ! { ! if (!retpar_done_fl) ! retpar_done_fl++; ! else /* one row was already extracted */ ! CHECK_ERR (-ER_SEL); ! } cnt_res = PRET->OutNum; if (res_hole_cnt < cnt_res) diff -rc gnusql-0.7b6.0/src/interpr/intlib.c gnusql-0.7b6.1/src/interpr/intlib.c *** gnusql-0.7b6.0/src/interpr/intlib.c Fri Sep 11 15:46:35 1998 --- gnusql-0.7b6.1/src/interpr/intlib.c Tue Sep 29 18:23:40 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: intlib.c,v 1.251 1998/09/11 19:46:35 kimelman Exp $ */ #include "global.h" #include "inprtyp.h" --- 25,31 ---- * */ ! /* $Id: intlib.c,v 1.253 1998/09/29 22:23:40 kimelman Exp $ */ #include "global.h" #include "inprtyp.h" *************** *** 736,764 **** } if (NlFlCur == REGULAR_VALUE) ! if ((pred->code == OR) || (pred->code == AND)) ! if (((pred->code == OR) && (LngCur == 1)) || ! ((pred->code == AND) && (LngCur == 0))) ! { ! traverse_handle (cur, handle); ! GO_UP(cur,handle); ! break; ! } ! else ! if (RhExist (cur)) ! DtPop ! else {} ! else ! (StcCur.flg)++; else /* NlFlCur == NULL_VALUE */ ! if (Is_Comp_Code (pred->code) || Is_Arithm_Code (pred->code)) ! { ! traverse_handle (cur, handle); ! GO_UP(cur,handle); ! break; ! } ! else ! (StcCur.flg)++; /* -------------- End of optimisation part ---------------- */ } else --- 736,769 ---- } if (NlFlCur == REGULAR_VALUE) ! { ! if ((pred->code == OR) || (pred->code == AND)) ! if (((pred->code == OR) && (LngCur == 1)) || ! ((pred->code == AND) && (LngCur == 0))) ! { ! traverse_handle (cur, handle); ! GO_UP(cur,handle); ! break; ! } ! else ! { ! if (RhExist (cur)) ! DtPop; ! } ! else ! (StcCur.flg)++; ! } else /* NlFlCur == NULL_VALUE */ ! { ! if (Is_Comp_Code (pred->code) || Is_Arithm_Code (pred->code)) ! { ! traverse_handle (cur, handle); ! GO_UP(cur,handle); ! break; ! } ! else ! (StcCur.flg)++; ! } /* -------------- End of optimisation part ---------------- */ } else *************** *** 860,874 **** COMP(LT, Right, where_right); if (!where_right) ! if (cond->RightCode == LT) ! where_right = 3; ! else ! { ! /* putting to where_right : result of "DU > Cond.Right" */ ! COMP(GT, Right, where_right); ! ! where_right += 2; ! } } return code[where_left][where_right]; } /* where_in_SP */ --- 865,881 ---- COMP(LT, Right, where_right); if (!where_right) ! { ! if (cond->RightCode == LT) ! where_right = 3; ! else ! { ! /* putting to where_right : result of "DU > Cond.Right" */ ! COMP(GT, Right, where_right); ! ! where_right += 2; ! } ! } } return code[where_left][where_right]; } /* where_in_SP */ diff -rc gnusql-0.7b6.0/src/kitty/Makefile.in gnusql-0.7b6.1/src/kitty/Makefile.in *** gnusql-0.7b6.0/src/kitty/Makefile.in Mon Sep 28 02:09:28 1998 --- gnusql-0.7b6.1/src/kitty/Makefile.in Tue Sep 29 17:26:14 1998 *************** *** 2,12 **** ## GNU SQL Compiler tools (kitty) ## ############################################################################# ## ! ## $Id: Makefile.in,v 1.246 1998/09/28 06:03:07 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler tools (kitty) ## ############################################################################# ## ! ## $Id: Makefile.in,v 1.247 1998/09/29 21:26:14 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/kitty/compare.c gnusql-0.7b6.1/src/kitty/compare.c *** gnusql-0.7b6.0/src/kitty/compare.c Wed Sep 16 17:00:33 1998 --- gnusql-0.7b6.1/src/kitty/compare.c Tue Sep 29 17:26:14 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * *************** *** 25,31 **** * */ ! #pragma "$Id: compare.c,v 1.247 1998/09/16 21:00:33 kimelman Exp $" #include #include --- 25,31 ---- * */ ! #pragma "$Id: compare.c,v 1.248 1998/09/29 21:26:14 kimelman Exp $" #include #include diff -rc gnusql-0.7b6.0/src/kitty/conv.c gnusql-0.7b6.1/src/kitty/conv.c *** gnusql-0.7b6.0/src/kitty/conv.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/kitty/conv.c Tue Sep 29 17:26:15 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * *************** *** 26,32 **** * */ ! /* $Id: conv.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "global.h" #include --- 26,32 ---- * */ ! /* $Id: conv.c,v 1.246 1998/09/29 21:26:15 kimelman Exp $ */ #include "global.h" #include diff -rc gnusql-0.7b6.0/src/kitty/gen.c gnusql-0.7b6.1/src/kitty/gen.c *** gnusql-0.7b6.0/src/kitty/gen.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/kitty/gen.c Tue Sep 29 17:26:15 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * *************** *** 25,31 **** * */ ! /* $Id: gen.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "global.h" #include --- 25,31 ---- * */ ! /* $Id: gen.c,v 1.246 1998/09/29 21:26:15 kimelman Exp $ */ #include "global.h" #include diff -rc gnusql-0.7b6.0/src/kitty/kitty.c gnusql-0.7b6.1/src/kitty/kitty.c *** gnusql-0.7b6.0/src/kitty/kitty.c Wed Sep 16 17:02:11 1998 --- gnusql-0.7b6.1/src/kitty/kitty.c Tue Sep 29 22:39:06 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * *************** *** 25,31 **** * */ ! /* $Id: kitty.c,v 1.251 1998/09/16 21:02:11 kimelman Exp $ */ #include #include "kitty.h" --- 25,31 ---- * */ ! /* $Id: kitty.c,v 1.253 1998/09/30 02:39:06 kimelman Exp $ */ #include #include "kitty.h" *************** *** 352,359 **** fprintf (yout, "/* end of %s */\n", RULE_NAME (r)); } ! i4_t ! main (i4_t argc, char **argv) { TXTREF r; char *result = NULL; --- 352,359 ---- fprintf (yout, "/* end of %s */\n", RULE_NAME (r)); } ! int ! main (int argc, char **argv) { TXTREF r; char *result = NULL; diff -rc gnusql-0.7b6.0/src/kitty/node.c gnusql-0.7b6.1/src/kitty/node.c *** gnusql-0.7b6.0/src/kitty/node.c Mon Mar 31 06:03:38 1997 --- gnusql-0.7b6.1/src/kitty/node.c Tue Sep 29 18:23:41 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * Modified by Michael Kimelman. --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Software * This file is written by Andrew Yahin. * Modified by Michael Kimelman. *************** *** 27,33 **** * */ ! /* $Id: node.c,v 1.246 1997/03/31 11:03:38 kml Exp $ */ #include #include --- 27,33 ---- * */ ! /* $Id: node.c,v 1.248 1998/09/29 22:23:41 kimelman Exp $ */ #include #include *************** *** 441,455 **** } indent-=2; if(right_ptr) ! if(look_to_the_right) ! { ! if(!is_tree(t)) ! fputs(")",yout); ! CHECK_COMMA; ! emit_trn_constructor(RIGHT_TRN(t),1); ! } ! else if(is_tree(t)) ! fputs(",TNULL",yout); fprintf(yout,")"); return; } --- 441,457 ---- } indent-=2; if(right_ptr) ! { ! if(look_to_the_right) ! { ! if(!is_tree(t)) ! fputs(")",yout); ! CHECK_COMMA; ! emit_trn_constructor(RIGHT_TRN(t),1); ! } ! else if(is_tree(t)) ! fputs(",TNULL",yout); ! } fprintf(yout,")"); return; } diff -rc gnusql-0.7b6.0/src/main/Makefile.in gnusql-0.7b6.1/src/main/Makefile.in *** gnusql-0.7b6.0/src/main/Makefile.in Mon Sep 28 02:09:29 1998 --- gnusql-0.7b6.1/src/main/Makefile.in Tue Sep 29 17:26:17 1998 *************** *** 2,12 **** ## GNU SQL Compiler (main routines) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.249 1998/09/28 06:03:07 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (main routines) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.250 1998/09/29 21:26:17 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/main/cs_link.c gnusql-0.7b6.1/src/main/cs_link.c *** gnusql-0.7b6.0/src/main/cs_link.c Wed Jul 29 23:23:37 1998 --- gnusql-0.7b6.1/src/main/cs_link.c Tue Sep 29 17:26:17 1998 *************** *** 6,12 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 6,12 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 28,34 **** * */ ! /* $Id: cs_link.c,v 1.246 1998/07/30 03:23:37 kimelman Exp $ */ #ifndef __CS_LINK_H__ #define __CS_LINK_H__ --- 28,34 ---- * */ ! /* $Id: cs_link.c,v 1.247 1998/09/29 21:26:17 kimelman Exp $ */ #ifndef __CS_LINK_H__ #define __CS_LINK_H__ diff -rc gnusql-0.7b6.0/src/main/dyn_client.c gnusql-0.7b6.1/src/main/dyn_client.c *** gnusql-0.7b6.0/src/main/dyn_client.c Wed Jul 29 23:23:37 1998 --- gnusql-0.7b6.1/src/main/dyn_client.c Tue Sep 29 17:26:18 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 26,32 **** * */ ! /* $Id: dyn_client.c,v 1.246 1998/07/30 03:23:37 kimelman Exp $ */ #define __CLIENT__ --- 26,32 ---- * */ ! /* $Id: dyn_client.c,v 1.247 1998/09/29 21:26:18 kimelman Exp $ */ #define __CLIENT__ diff -rc gnusql-0.7b6.0/src/main/dyn_funcs.c gnusql-0.7b6.1/src/main/dyn_funcs.c *** gnusql-0.7b6.0/src/main/dyn_funcs.c Wed May 20 01:57:37 1998 --- gnusql-0.7b6.1/src/main/dyn_funcs.c Tue Sep 29 18:23:42 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: dyn_funcs.c,v 1.247 1998/05/20 05:57:37 kml Exp $ */ #include "setup_os.h" #ifdef HAVE_STDARG_H --- 25,31 ---- * */ ! /* $Id: dyn_funcs.c,v 1.249 1998/09/29 22:23:42 kimelman Exp $ */ #include "setup_os.h" #ifdef HAVE_STDARG_H *************** *** 435,445 **** return -DS_DESCR; src = (is_input) ? &(stmt->in_descr) : &(stmt->out_descr); if (src->count > descr->alloc_cnt) ! if (descr->maximum) ! return -DS_DESCRLEN; ! else ! CHECK_ARR_SIZE (descr->values, descr->alloc_cnt, ! src->count, sql_descr_element_t); descr->count = src->count; CHECK_FREE_DATA (descr->values, descr->count); TYP_COPY (src->values, descr->values, src->count, sql_descr_element_t); --- 435,447 ---- return -DS_DESCR; src = (is_input) ? &(stmt->in_descr) : &(stmt->out_descr); if (src->count > descr->alloc_cnt) ! { ! if (descr->maximum) ! return -DS_DESCRLEN; ! else ! CHECK_ARR_SIZE (descr->values, descr->alloc_cnt, ! src->count, sql_descr_element_t); ! } descr->count = src->count; CHECK_FREE_DATA (descr->values, descr->count); TYP_COPY (src->values, descr->values, src->count, sql_descr_element_t); *************** *** 483,503 **** interp_mdl.segment = segm; if (stmt) ! if (command == COM_START) ! { ! stmt_descr = &(stmt->in_descr); ! need_cnt = stmt_descr->count; ! if (need_cnt) ! need_arg++; ! } ! else ! if (command == COM_FETCH) { stmt_descr = &(stmt->out_descr); need_cnt = stmt_descr->count; need_res++; } ! if (using_descr && using_descr->maximum && using_descr->count > using_descr->maximum) return -DS_CNT; --- 485,505 ---- interp_mdl.segment = segm; if (stmt) ! { ! if (command == COM_START) { + stmt_descr = &(stmt->in_descr); + need_cnt = stmt_descr->count; + if (need_cnt) + need_arg++; + } + else if (command == COM_FETCH) + { stmt_descr = &(stmt->out_descr); need_cnt = stmt_descr->count; need_res++; } ! } if (using_descr && using_descr->maximum && using_descr->count > using_descr->maximum) return -DS_CNT; *************** *** 555,571 **** return -DS_NORES; if (!(using_descr->count)) using_descr->count = need_cnt; ! else ! if (using_descr->count != need_cnt) ! return -DS_BADTAR; if (need_cnt > using_descr->alloc_cnt) ! if (using_descr->maximum) ! return -DS_DESCRLEN; ! else ! CHECK_ARR_SIZE (using_descr->values, using_descr->alloc_cnt, ! need_cnt, sql_descr_element_t); ! for (i = 0, val = using_descr->values, need_val = stmt_descr->values, arg = &(args.prm[0]); i < need_cnt; i++, val++, need_val++, arg++) --- 557,573 ---- return -DS_NORES; if (!(using_descr->count)) using_descr->count = need_cnt; ! else if (using_descr->count != need_cnt) ! return -DS_BADTAR; if (need_cnt > using_descr->alloc_cnt) ! { ! if (using_descr->maximum) ! return -DS_DESCRLEN; ! else ! CHECK_ARR_SIZE (using_descr->values, using_descr->alloc_cnt, ! need_cnt, sql_descr_element_t); ! } for (i = 0, val = using_descr->values, need_val = stmt_descr->values, arg = &(args.prm[0]); i < need_cnt; i++, val++, need_val++, arg++) diff -rc gnusql-0.7b6.0/src/main/gsql_cli.c gnusql-0.7b6.1/src/main/gsql_cli.c *** gnusql-0.7b6.0/src/main/gsql_cli.c Wed Jul 29 23:23:38 1998 --- gnusql-0.7b6.1/src/main/gsql_cli.c Tue Sep 29 22:39:07 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 25,31 **** * */ ! /* $Id: gsql_cli.c,v 1.248 1998/07/30 03:23:38 kimelman Exp $ */ /* * Macro __CLIENT__ has to be defined here to mark this file as a main --- 25,31 ---- * */ ! /* $Id: gsql_cli.c,v 1.250 1998/09/30 02:39:07 kimelman Exp $ */ /* * Macro __CLIENT__ has to be defined here to mark this file as a main *************** *** 232,241 **** return 1; }/*-----------------------------------------------------------------------*/ ! i4_t ! main (i4_t argc, char *argv[]) { ! i4_t i, done, errs; read_options (argc, argv); Argc = argc; --- 232,241 ---- return 1; }/*-----------------------------------------------------------------------*/ ! int ! main (int argc, char **argv) { ! int i, done, errs; read_options (argc, argv); Argc = argc; diff -rc gnusql-0.7b6.0/src/main/gsqltrn.h.preserve gnusql-0.7b6.1/src/main/gsqltrn.h.preserve *** gnusql-0.7b6.0/src/main/gsqltrn.h.preserve Mon Sep 28 21:56:08 1998 --- gnusql-0.7b6.1/src/main/gsqltrn.h.preserve Tue Sep 29 22:47:13 1998 *************** *** 1,4 **** ! /* generated by /home/kimelman/etc/gsql/gl/etc/rpcgen-sh /usr/bin/rpcgen . dmode /home/kimelman/etc/gsql/gl/src/include /home/kimelman/etc/gsql/gl/src/main/gsqltrn.x at Mon Sep 28 01:12:56 EDT 1998*/ # include "conn_handler.h" /* * Please do not edit this file. --- 1,4 ---- ! /* generated by /home/kimelman/etc/gsql/gl/etc/rpcgen-sh /usr/bin/rpcgen . /home/kimelman/etc/gsql/gl/src/include /home/kimelman/etc/gsql/gl/src/main/gsqltrn.x at Tue Sep 29 22:00:18 EDT 1998*/ # include "conn_handler.h" /* * Please do not edit this file. diff -rc gnusql-0.7b6.0/src/main/gsqltrn.x gnusql-0.7b6.1/src/main/gsqltrn.x *** gnusql-0.7b6.0/src/main/gsqltrn.x Fri Aug 14 12:56:35 1998 --- gnusql-0.7b6.1/src/main/gsqltrn.x Tue Sep 29 17:26:19 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Dyshlevoi Konstantin * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Dyshlevoi Konstantin * *************** *** 25,31 **** * */ ! /* $Id: gsqltrn.x,v 1.247 1998/07/30 03:23:38 kimelman Exp $ */ #ifdef RPC_SVC %#define main run_server --- 25,31 ---- * */ ! /* $Id: gsqltrn.x,v 1.248 1998/09/29 21:26:19 kimelman Exp $ */ #ifdef RPC_SVC %#define main run_server diff -rc gnusql-0.7b6.0/src/main/gsqltrn_lib.c gnusql-0.7b6.1/src/main/gsqltrn_lib.c *** gnusql-0.7b6.0/src/main/gsqltrn_lib.c Mon Sep 28 20:39:40 1998 --- gnusql-0.7b6.1/src/main/gsqltrn_lib.c Tue Sep 29 22:39:08 1998 *************** *** 1,11 **** /* * gsqltrn.c - GNU SQL transaction client/server protocol interface * ! * $Id: gsqltrn_lib.c,v 1.249 1998/09/29 00:39:40 kimelman Exp $ * * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 1,11 ---- /* * gsqltrn.c - GNU SQL transaction client/server protocol interface * ! * $Id: gsqltrn_lib.c,v 1.251 1998/09/30 02:39:08 kimelman Exp $ * * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 231,237 **** } int ! main(i4_t argc, char *argv[]) { MEET_DEBUGGER; bd_catalog_read = (server_init(argc,argv) == 0); --- 231,237 ---- } int ! main(int argc, char **argv) { MEET_DEBUGGER; bd_catalog_read = (server_init(argc,argv) == 0); diff -rc gnusql-0.7b6.0/src/main/gsqltrn_svc.c.preserve gnusql-0.7b6.1/src/main/gsqltrn_svc.c.preserve *** gnusql-0.7b6.0/src/main/gsqltrn_svc.c.preserve Mon Sep 28 21:56:08 1998 --- gnusql-0.7b6.1/src/main/gsqltrn_svc.c.preserve Tue Sep 29 22:47:13 1998 *************** *** 1,15 **** /* * Please do not edit this file. - * It was generated by /home/kimelman/etc/gsql/gl/etc/rpcgen-sh - */ - - #include "gsqltrn.h" - - #define main main_rpc_server - #define main_direct_server RUN_MY_SERVER - - /* - * Please do not edit this file. * It was generated using rpcgen. */ --- 1,5 ---- *************** *** 29,35 **** #endif #define _RPCSVC_CLOSEDOWN 120 ! #define RUN_MY_SERVER run_server #define RPC_SVC_FG #undef GSQL_TRN #define GSQL_TRN rpc_program_id --- 19,25 ---- #endif #define _RPCSVC_CLOSEDOWN 120 ! #define main run_server #define RPC_SVC_FG #undef GSQL_TRN #define GSQL_TRN rpc_program_id *************** *** 279,363 **** exit(1); /* NOTREACHED */ } - - #ifndef RPCGEN_ACTION - #define RPCGEN_ACTION - #endif - - /* - * Please do not edit this file. - * It was generated using rpcgen. - */ - - - struct rpcgen_table gsql_trn_1_table[] = { - - (void *(*)())0, - (xdrproc_t) xdr_void, 0, - (xdrproc_t) xdr_void, 0, - - (void *(*)())RPCGEN_ACTION(init_comp_1), - (xdrproc_t) xdr_init_params_t, sizeof ( init_params_t ), - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(compile_1), - (xdrproc_t) xdr_stmt_info_t, sizeof ( stmt_info_t ), - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(del_segment_1), - (xdrproc_t) xdr_seg_del_t, sizeof ( seg_del_t ), - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(link_cursor_1), - (xdrproc_t) xdr_link_cursor_t, sizeof ( link_cursor_t ), - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(load_module_1), - (xdrproc_t) xdr_string_t, sizeof ( string_t ), - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(execute_stmt_1), - (xdrproc_t) xdr_insn_t, sizeof ( insn_t ), - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(db_create_1), - (xdrproc_t) xdr_void, 0, - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(retry_1), - (xdrproc_t) xdr_void, 0, - (xdrproc_t) xdr_result_t, sizeof ( result_t ), - - (void *(*)())RPCGEN_ACTION(is_rpc_ready_1), - (xdrproc_t) xdr_void, 0, - (xdrproc_t) xdr_int, sizeof ( int ), - }; - int gsql_trn_1_nproc = - sizeof(gsql_trn_1_table)/sizeof(gsql_trn_1_table[0]); - - gss_server_t *server = NULL; - - static void - gss_server_exit(void) - { - deallocate_gss_server(server); - } - - int - main_direct_server( - #ifdef RPCMAIN_PROTO - int argc, - char** argv - #else - void - #endif - ) - { - if (server==NULL) { - ATEXIT(gss_server_exit); - server = allocate_gss_server (); - register_gss_service(server, GSQL_TRN, 1, gsql_trn_1_table, gsql_trn_1_nproc); - } - return run_gss_server (server, -2); /* wait foreever */ - } - --- 269,271 ---- Only in gnusql-0.7b6.0/src/main: include_clnt.c Only in gnusql-0.7b6.0/src/main: include_svc.c diff -rc gnusql-0.7b6.0/src/main/options.c gnusql-0.7b6.1/src/main/options.c *** gnusql-0.7b6.0/src/main/options.c Wed May 20 01:57:37 1998 --- gnusql-0.7b6.1/src/main/options.c Tue Sep 29 17:26:20 1998 *************** *** 6,12 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 6,12 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 28,34 **** * */ ! /* $Id: options.c,v 1.246 1998/05/20 05:57:37 kml Exp $ */ #if !defined(__CLIENT__) && !defined(__SERVER__) #error File options.c can`t be included here!!!! --- 28,34 ---- * */ ! /* $Id: options.c,v 1.247 1998/09/29 21:26:20 kimelman Exp $ */ #if !defined(__CLIENT__) && !defined(__SERVER__) #error File options.c can`t be included here!!!! diff -rc gnusql-0.7b6.0/src/main/sc.c gnusql-0.7b6.1/src/main/sc.c *** gnusql-0.7b6.0/src/main/sc.c Mon Sep 28 02:09:29 1998 --- gnusql-0.7b6.1/src/main/sc.c Tue Sep 29 17:26:21 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: sc.c,v 1.249 1998/09/28 05:33:59 kimelman Exp $ */ #include "setup_os.h" #include "global.h" --- 25,31 ---- * */ ! /* $Id: sc.c,v 1.250 1998/09/29 21:26:21 kimelman Exp $ */ #include "setup_os.h" #include "global.h" diff -rc gnusql-0.7b6.0/src/main/servlib.c gnusql-0.7b6.1/src/main/servlib.c *** gnusql-0.7b6.0/src/main/servlib.c Sat Sep 12 18:03:27 1998 --- gnusql-0.7b6.1/src/main/servlib.c Tue Sep 29 17:26:21 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: servlib.c,v 1.248 1998/09/12 21:46:03 kimelman Exp $ */ /* * Macro __SERVER__ defined here marks this file as a main file on --- 25,31 ---- * */ ! /* $Id: servlib.c,v 1.249 1998/09/29 21:26:21 kimelman Exp $ */ /* * Macro __SERVER__ defined here marks this file as a main file on diff -rc gnusql-0.7b6.0/src/opt/Makefile.in gnusql-0.7b6.1/src/opt/Makefile.in *** gnusql-0.7b6.0/src/opt/Makefile.in Mon Sep 28 20:39:41 1998 --- gnusql-0.7b6.1/src/opt/Makefile.in Tue Sep 29 17:26:22 1998 *************** *** 2,12 **** ## GNU SQL Compiler (optimizer pass) ## ########################################################### ## ! ## $Id: Makefile.in,v 1.247 1998/09/29 00:39:41 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (optimizer pass) ## ########################################################### ## ! ## $Id: Makefile.in,v 1.248 1998/09/29 21:26:22 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/opt/cnf.k gnusql-0.7b6.1/src/opt/cnf.k *** gnusql-0.7b6.0/src/opt/cnf.k Mon Sep 14 19:47:01 1998 --- gnusql-0.7b6.1/src/opt/cnf.k Tue Sep 29 17:26:23 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * *************** *** 25,31 **** * */ ! /* $Id: cnf.k,v 1.245 1997/03/31 03:46:38 kml Exp $ */ i4_t assotiative_operation(TXTREF node); i4_t the_same_code(TXTREF node); --- 25,31 ---- * */ ! /* $Id: cnf.k,v 1.246 1998/09/29 21:26:23 kimelman Exp $ */ i4_t assotiative_operation(TXTREF node); i4_t the_same_code(TXTREF node); diff -rc gnusql-0.7b6.0/src/opt/get_up.k gnusql-0.7b6.1/src/opt/get_up.k *** gnusql-0.7b6.0/src/opt/get_up.k Wed Sep 16 17:03:16 1998 --- gnusql-0.7b6.1/src/opt/get_up.k Tue Sep 29 17:26:23 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: get_up.k,v 1.247 1998/09/16 21:03:16 kimelman Exp $ */ #include "cycler.h" #include "opt.h" --- 25,31 ---- * */ ! /* $Id: get_up.k,v 1.248 1998/09/29 21:26:23 kimelman Exp $ */ #include "cycler.h" #include "opt.h" diff -rc gnusql-0.7b6.0/src/opt/groupby.k gnusql-0.7b6.1/src/opt/groupby.k *** gnusql-0.7b6.0/src/opt/groupby.k Thu Apr 24 14:41:28 1997 --- gnusql-0.7b6.1/src/opt/groupby.k Tue Sep 29 17:26:24 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 25,31 **** * */ ! /* $Id: groupby.k,v 1.248 1997/04/24 18:41:28 kml Exp $ */ #include "cycler.h" #include "opt.h" --- 25,31 ---- * */ ! /* $Id: groupby.k,v 1.249 1998/09/29 21:26:24 kimelman Exp $ */ #include "cycler.h" #include "opt.h" diff -rc gnusql-0.7b6.0/src/opt/insert.k gnusql-0.7b6.1/src/opt/insert.k *** gnusql-0.7b6.0/src/opt/insert.k Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/opt/insert.k Tue Sep 29 17:26:24 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. 1994 * Rewritten by Michael Kimelman. 1995 --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. 1994 * Rewritten by Michael Kimelman. 1995 *************** *** 26,32 **** * */ ! /* $Id: insert.k,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "trl.h" #include "opt.h" --- 26,32 ---- * */ ! /* $Id: insert.k,v 1.246 1998/09/29 21:26:24 kimelman Exp $ */ #include "trl.h" #include "opt.h" diff -rc gnusql-0.7b6.0/src/opt/opt.h gnusql-0.7b6.1/src/opt/opt.h *** gnusql-0.7b6.0/src/opt/opt.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/opt/opt.h Tue Sep 29 17:26:24 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 25,31 **** * */ ! /* $Id: opt.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __OPT_H__ #define __OPT_H__ --- 25,31 ---- * */ ! /* $Id: opt.h,v 1.246 1998/09/29 21:26:24 kimelman Exp $ */ #ifndef __OPT_H__ #define __OPT_H__ diff -rc gnusql-0.7b6.0/src/opt/optimize.k gnusql-0.7b6.1/src/opt/optimize.k *** gnusql-0.7b6.0/src/opt/optimize.k Mon Sep 28 01:02:25 1998 --- gnusql-0.7b6.1/src/opt/optimize.k Tue Sep 29 17:26:25 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * *************** *** 25,31 **** * */ ! /* $Id: optimize.k,v 1.249 1998/09/28 04:51:20 kimelman Exp $ */ #include "setup_os.h" #include --- 25,31 ---- * */ ! /* $Id: optimize.k,v 1.250 1998/09/29 21:26:25 kimelman Exp $ */ #include "setup_os.h" #include diff -rc gnusql-0.7b6.0/src/opt/optutil.k gnusql-0.7b6.1/src/opt/optutil.k *** gnusql-0.7b6.0/src/opt/optutil.k Mon Mar 31 06:03:23 1997 --- gnusql-0.7b6.1/src/opt/optutil.k Tue Sep 29 17:26:25 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * Modifyed by Michael Kimelman. --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * Modifyed by Michael Kimelman. *************** *** 26,32 **** * */ ! /* $Id: optutil.k,v 1.246 1997/03/31 11:03:23 kml Exp $ */ #include "opt.h" --- 26,32 ---- * */ ! /* $Id: optutil.k,v 1.247 1998/09/29 21:26:25 kimelman Exp $ */ #include "opt.h" diff -rc gnusql-0.7b6.0/src/opt/sorter.k gnusql-0.7b6.1/src/opt/sorter.k *** gnusql-0.7b6.0/src/opt/sorter.k Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/opt/sorter.k Tue Sep 29 17:26:26 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin. * *************** *** 26,32 **** * */ ! /* $Id: sorter.k,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include #include "cycler.h" --- 26,32 ---- * */ ! /* $Id: sorter.k,v 1.246 1998/09/29 21:26:26 kimelman Exp $ */ #include #include "cycler.h" diff -rc gnusql-0.7b6.0/src/opt/update.k gnusql-0.7b6.1/src/opt/update.k *** gnusql-0.7b6.0/src/opt/update.k Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/opt/update.k Tue Sep 29 17:26:26 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin, 1995. * Rewritten by Michael Kimelman. 1996 --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin, 1995. * Rewritten by Michael Kimelman. 1996 *************** *** 27,33 **** * */ ! /* $Id: update.k,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "tree_gen.h" #include "opt.h" --- 27,33 ---- * */ ! /* $Id: update.k,v 1.246 1998/09/29 21:26:26 kimelman Exp $ */ #include "tree_gen.h" #include "opt.h" diff -rc gnusql-0.7b6.0/src/other/Makefile.in gnusql-0.7b6.1/src/other/Makefile.in *** gnusql-0.7b6.0/src/other/Makefile.in Wed Jul 29 23:23:38 1998 --- gnusql-0.7b6.1/src/other/Makefile.in Tue Sep 29 17:26:27 1998 *************** *** 2,12 **** ## GNU SQL Compiler (common support) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.250 1998/07/30 03:23:38 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (common support) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.251 1998/09/29 21:26:27 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/other/a2k_p1.l gnusql-0.7b6.1/src/other/a2k_p1.l *** gnusql-0.7b6.0/src/other/a2k_p1.l Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/other/a2k_p1.l Tue Sep 29 17:26:27 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 28,34 **** #include ! /* $Id: a2k_p1.l,v 1.245 1997/03/31 03:46:38 kml Exp $ */ %} --- 28,34 ---- #include ! /* $Id: a2k_p1.l,v 1.246 1998/09/29 21:26:27 kimelman Exp $ */ %} diff -rc gnusql-0.7b6.0/src/other/check_tp.c gnusql-0.7b6.1/src/other/check_tp.c *** gnusql-0.7b6.0/src/other/check_tp.c Tue Sep 15 01:08:43 1998 --- gnusql-0.7b6.1/src/other/check_tp.c Tue Sep 29 17:26:28 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * *************** *** 26,32 **** * */ ! /* $Id: check_tp.c,v 1.248 1998/09/15 05:08:43 kimelman Exp $ */ #include "global.h" #include "cycler.h" --- 26,32 ---- * */ ! /* $Id: check_tp.c,v 1.249 1998/09/29 21:26:28 kimelman Exp $ */ #include "global.h" #include "cycler.h" diff -rc gnusql-0.7b6.0/src/other/cl_lib.c gnusql-0.7b6.1/src/other/cl_lib.c *** gnusql-0.7b6.0/src/other/cl_lib.c Fri Aug 14 21:59:53 1998 --- gnusql-0.7b6.1/src/other/cl_lib.c Tue Sep 29 18:23:43 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: cl_lib.c,v 1.253 1998/08/15 01:59:53 kimelman Exp $ */ #include "setup_os.h" #ifdef HAVE_UNISTD_H --- 26,32 ---- * */ ! /* $Id: cl_lib.c,v 1.255 1998/09/29 22:23:43 kimelman Exp $ */ #include "setup_os.h" #ifdef HAVE_UNISTD_H *************** *** 346,352 **** xfree(csvr); } ! static commit_down_mode = 0; static int down_service(svr_t *csvr, svc_t *csvc) --- 346,352 ---- xfree(csvr); } ! static int commit_down_mode = 0; static int down_service(svr_t *csvr, svc_t *csvc) diff -rc gnusql-0.7b6.0/src/other/conn_handler.c gnusql-0.7b6.1/src/other/conn_handler.c *** gnusql-0.7b6.0/src/other/conn_handler.c Sat Aug 22 00:20:09 1998 --- gnusql-0.7b6.1/src/other/conn_handler.c Tue Sep 29 18:23:43 1998 *************** *** 1,10 **** /* * conn_handler.c - connection/stubs & rpc/msg swither ! * $Id: conn_handler.c,v 1.8 1998/08/22 04:20:09 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 1,10 ---- /* * conn_handler.c - connection/stubs & rpc/msg swither ! * $Id: conn_handler.c,v 1.10 1998/09/29 22:23:43 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,30 **** --- 25,36 ---- * Contacts: gss@ispras.ru * * $Log: conn_handler.c,v $ + * Revision 1.10 1998/09/29 22:23:43 kimelman + * make SGI compiler happy about {} around 'else' + * + * Revision 1.9 1998/09/29 21:26:29 kimelman + * copyright years fixed + * * Revision 1.8 1998/08/22 04:20:09 kimelman * direct_mode timeout handling * *************** *** 204,210 **** gss_client_t * get_gss_handle(char *hostname,long svc_id, long vers_id, int timeout) { - static int done=0; gss_client_t *gc; gc = xmalloc(sizeof(*gc)); --- 210,215 ---- *************** *** 211,216 **** --- 216,222 ---- #ifdef DIRECT_MODE if(strcmp(hostname,"localhost") == 0) { + static int done=0; int dispatch_id; if(!done) { *************** *** 643,652 **** errno=0; len = msgrcv(svc->h.t,(MSGBUFP)&msg,sizeof(msg.mtext),id,0); if ( len == -1 ) ! if (errno != EINTR) ! return 0; ! else ! continue; gss_msg_write(&(svc->h.cache),msg.mtext,len); } alarm(0); /* clear timeout interval */ --- 649,660 ---- errno=0; len = msgrcv(svc->h.t,(MSGBUFP)&msg,sizeof(msg.mtext),id,0); if ( len == -1 ) ! { ! if (errno != EINTR) ! return 0; ! else ! continue; ! } gss_msg_write(&(svc->h.cache),msg.mtext,len); } alarm(0); /* clear timeout interval */ diff -rc gnusql-0.7b6.0/src/other/sql_decl.c gnusql-0.7b6.1/src/other/sql_decl.c *** gnusql-0.7b6.0/src/other/sql_decl.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/other/sql_decl.c Tue Sep 29 17:26:29 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: sql_decl.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "xmem.h" #include --- 25,31 ---- * */ ! /* $Id: sql_decl.c,v 1.246 1998/09/29 21:26:29 kimelman Exp $ */ #include "xmem.h" #include diff -rc gnusql-0.7b6.0/src/other/sql_type.c gnusql-0.7b6.1/src/other/sql_type.c *** gnusql-0.7b6.0/src/other/sql_type.c Mon Mar 31 06:03:16 1997 --- gnusql-0.7b6.1/src/other/sql_type.c Tue Sep 29 17:26:30 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of SysTem Prpgramming * This file is written by Michael Kimelman & Konstantin Dyshlevoi * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of SysTem Prpgramming * This file is written by Michael Kimelman & Konstantin Dyshlevoi * *************** *** 25,31 **** * */ ! /* $Id: sql_type.c,v 1.246 1997/03/31 11:03:16 kml Exp $ */ #include "setup_os.h" #include "sql.h" --- 25,31 ---- * */ ! /* $Id: sql_type.c,v 1.247 1998/09/29 21:26:30 kimelman Exp $ */ #include "setup_os.h" #include "sql.h" diff -rc gnusql-0.7b6.0/src/other/svr_lib.c gnusql-0.7b6.1/src/other/svr_lib.c *** gnusql-0.7b6.0/src/other/svr_lib.c Mon Jun 9 05:19:32 1997 --- gnusql-0.7b6.1/src/other/svr_lib.c Tue Sep 29 17:26:30 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: svr_lib.c,v 1.247 1997/06/09 09:19:32 vera Exp $ */ #include "setup_os.h" --- 25,31 ---- * */ ! /* $Id: svr_lib.c,v 1.248 1998/09/29 21:26:30 kimelman Exp $ */ #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/other/type_lib.c gnusql-0.7b6.1/src/other/type_lib.c *** gnusql-0.7b6.0/src/other/type_lib.c Wed Sep 16 18:51:35 1998 --- gnusql-0.7b6.1/src/other/type_lib.c Tue Sep 29 18:23:44 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi. * *************** *** 25,31 **** * */ ! /* $Id: type_lib.c,v 1.250 1998/09/16 22:51:35 kimelman Exp $ */ #include --- 25,31 ---- * */ ! /* $Id: type_lib.c,v 1.252 1998/09/29 22:23:44 kimelman Exp $ */ #include *************** *** 395,411 **** { i4_t res = FALSE; if (code == SUBQUERY) /* in comparision predicate */ ! if (NlFlPred == UNKNOWN_VALUE) ! DtPredEl = DtCurEl; ! else /* second row in SubQuery result */ ! return -ER_SQ; ! ! else /* ALL | SOME | */ ! { ! assert (code == EXISTS); ! abort(); ! } NlFlCur = REGULAR_VALUE; LngCur = res; CodCur = T_BOOL; --- 395,408 ---- { i4_t res = FALSE; + assert (code == EXISTS || code == SUBQUERY ); if (code == SUBQUERY) /* in comparision predicate */ ! { ! if (NlFlPred == UNKNOWN_VALUE) ! DtPredEl = DtCurEl; ! else /* second row in SubQuery result */ ! return -ER_SQ; ! } NlFlCur = REGULAR_VALUE; LngCur = res; CodCur = T_BOOL; diff -rc gnusql-0.7b6.0/src/other/vmemory.c gnusql-0.7b6.1/src/other/vmemory.c *** gnusql-0.7b6.0/src/other/vmemory.c Tue Jun 9 13:47:56 1998 --- gnusql-0.7b6.1/src/other/vmemory.c Tue Sep 29 18:23:45 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: vmemory.c,v 1.253 1998/06/09 17:47:56 kimelman Exp $ */ /*===================================================================== --- 25,31 ---- * */ ! /* $Id: vmemory.c,v 1.255 1998/09/29 22:23:45 kimelman Exp $ */ /*===================================================================== *************** *** 936,951 **** return (VADR)NULL; if (align != sizeof (i4_t) && align != PAGE_ALIGN ) ! if ((align > 0) && (align < sizeof (i4_t))) align = sizeof (i4_t); ! else ! { ! align = sizeof (i4_t); ! while ((align < size) && (align PAGE_ALIGN) ! align >>= 1; ! } while ((size + DSC_SZ + align) >= (pg_size - os_needs)) pg_size <<= 1; --- 936,953 ---- return (VADR)NULL; if (align != sizeof (i4_t) && align != PAGE_ALIGN ) ! { ! if ((align > 0) && (align < sizeof (i4_t))) align = sizeof (i4_t); ! else ! { ! align = sizeof (i4_t); ! while ((align < size) && (align PAGE_ALIGN) ! align >>= 1; ! } ! } while ((size + DSC_SZ + align) >= (pg_size - os_needs)) pg_size <<= 1; diff -rc gnusql-0.7b6.0/src/other/xmem.c gnusql-0.7b6.1/src/other/xmem.c *** gnusql-0.7b6.0/src/other/xmem.c Tue May 5 00:00:59 1998 --- gnusql-0.7b6.1/src/other/xmem.c Tue Sep 29 18:23:45 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * This code extracted from GNU CC and partially modified by Michael Kimelman * * This program is free software; you can redistribute it and/or modify --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * This code extracted from GNU CC and partially modified by Michael Kimelman * * This program is free software; you can redistribute it and/or modify *************** *** 24,30 **** * */ ! /* $Id: xmem.c,v 1.253 1998/05/05 04:00:59 kml Exp $ */ #include "xmem.h" #include --- 24,30 ---- * */ ! /* $Id: xmem.c,v 1.255 1998/09/29 22:23:45 kimelman Exp $ */ #include "xmem.h" #include *************** *** 143,149 **** void * xmalloc (i4_t size) { ! register char *ptr; if (size == 0) { if (!xxmalloc_flag) --- 143,149 ---- void * xmalloc (i4_t size) { ! register char *ptr = NULL; if (size == 0) { if (!xxmalloc_flag) *************** *** 151,157 **** } else { - ptr = NULL; errno=EAGAIN; while (errno==EAGAIN) { --- 151,156 ---- diff -rc gnusql-0.7b6.0/src/parse/Makefile.in gnusql-0.7b6.1/src/parse/Makefile.in *** gnusql-0.7b6.0/src/parse/Makefile.in Mon Sep 28 02:09:30 1998 --- gnusql-0.7b6.1/src/parse/Makefile.in Tue Sep 29 17:26:33 1998 *************** *** 2,12 **** ## GNU SQL Compiler (parser's phase) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.248 1998/09/28 06:03:07 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (parser's phase) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.249 1998/09/29 21:26:33 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/parse/gsqlmon.c.preserve gnusql-0.7b6.1/src/parse/gsqlmon.c.preserve *** gnusql-0.7b6.0/src/parse/gsqlmon.c.preserve Mon Sep 28 21:56:07 1998 --- gnusql-0.7b6.1/src/parse/gsqlmon.c.preserve Tue Sep 29 22:47:12 1998 *************** *** 388,398 **** /* * monitor.l - DB line monitor * ! * $Id: gsqlmon.l,v 1.249 1997/10/16 09:59:49 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman. * --- 388,398 ---- /* * monitor.l - DB line monitor * ! * $Id: gsqlmon.l,v 1.251 1998/09/30 02:39:48 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman. * *************** *** 1796,1804 **** } int ! main(int argc, char *argv[]) { - static char buffer[4096*4]; int stmt = 0; int rc; int i,j; --- 1796,1803 ---- } int ! main(int argc, char **argv) { int stmt = 0; int rc; int i,j; *************** *** 1826,1837 **** #define CHECK(st) if((rc=SQL__##st)!=0){ error_rprt(#st,rc,statement_scanner_buffer); goto error; } while(SCANNER_NAME()) { ! char *b; ! int l = strlen(statement_scanner_buffer); int *clms = NULL; SQL_DESCR in,out; ! if(statement_scanner_buffer==NULL) continue; if(strncmp(statement_scanner_buffer,"select",strlen("select"))) --- 1825,1836 ---- #define CHECK(st) if((rc=SQL__##st)!=0){ error_rprt(#st,rc,statement_scanner_buffer); goto error; } while(SCANNER_NAME()) { ! char *b = NULL; ! int l; int *clms = NULL; SQL_DESCR in,out; ! if(statement_scanner_buffer==NULL) continue; if(strncmp(statement_scanner_buffer,"select",strlen("select"))) *************** *** 1843,1848 **** --- 1842,1848 ---- } /* put select in parenthesys */ + l = strlen(statement_scanner_buffer); b = xmalloc(l+3); b[0] = '('; strcpy(b+1,statement_scanner_buffer); *************** *** 1970,1977 **** error: SQL__deallocate_descr(&in); SQL__deallocate_descr(&out); ! xfree(clms); ! xfree(b); b = NULL; } --- 1970,1980 ---- error: SQL__deallocate_descr(&in); SQL__deallocate_descr(&out); ! if (clms) ! xfree(clms); ! clms = NULL; ! if (b) ! xfree(b); b = NULL; } *************** *** 1981,1984 **** #ifndef yywrap int yywrap() { return 1; } #endif ! /*end of make-dist.tmp.13442/gnusql-0.7b6.0/src/parse/gsqlmon.c.preserve*/ --- 1984,1987 ---- #ifndef yywrap int yywrap() { return 1; } #endif ! /*end of make-dist.tmp.17704/gnusql-0.7b6.1/src/parse/gsqlmon.c.preserve*/ diff -rc gnusql-0.7b6.0/src/parse/gsqlmon.l gnusql-0.7b6.1/src/parse/gsqlmon.l *** gnusql-0.7b6.0/src/parse/gsqlmon.l Thu Oct 16 05:59:49 1997 --- gnusql-0.7b6.1/src/parse/gsqlmon.l Tue Sep 29 22:39:48 1998 *************** *** 2,12 **** /* * monitor.l - DB line monitor * ! * $Id: gsqlmon.l,v 1.249 1997/10/16 09:59:49 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman. * --- 2,12 ---- /* * monitor.l - DB line monitor * ! * $Id: gsqlmon.l,v 1.251 1998/09/30 02:39:48 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman. * *************** *** 215,223 **** } int ! main(int argc, char *argv[]) { - static char buffer[4096*4]; int stmt = 0; int rc; int i,j; --- 215,222 ---- } int ! main(int argc, char **argv) { int stmt = 0; int rc; int i,j; *************** *** 245,256 **** #define CHECK(st) if((rc=SQL__##st)!=0){ error_rprt(#st,rc,statement_scanner_buffer); goto error; } while(SCANNER_NAME()) { ! char *b; ! int l = strlen(statement_scanner_buffer); int *clms = NULL; SQL_DESCR in,out; ! if(statement_scanner_buffer==NULL) continue; if(strncmp(statement_scanner_buffer,"select",strlen("select"))) --- 244,255 ---- #define CHECK(st) if((rc=SQL__##st)!=0){ error_rprt(#st,rc,statement_scanner_buffer); goto error; } while(SCANNER_NAME()) { ! char *b = NULL; ! int l; int *clms = NULL; SQL_DESCR in,out; ! if(statement_scanner_buffer==NULL) continue; if(strncmp(statement_scanner_buffer,"select",strlen("select"))) *************** *** 262,267 **** --- 261,267 ---- } /* put select in parenthesys */ + l = strlen(statement_scanner_buffer); b = xmalloc(l+3); b[0] = '('; strcpy(b+1,statement_scanner_buffer); *************** *** 389,396 **** error: SQL__deallocate_descr(&in); SQL__deallocate_descr(&out); ! xfree(clms); ! xfree(b); b = NULL; } --- 389,399 ---- error: SQL__deallocate_descr(&in); SQL__deallocate_descr(&out); ! if (clms) ! xfree(clms); ! clms = NULL; ! if (b) ! xfree(b); b = NULL; } diff -rc gnusql-0.7b6.0/src/parse/parse.c.preserve gnusql-0.7b6.1/src/parse/parse.c.preserve *** gnusql-0.7b6.0/src/parse/parse.c.preserve Mon Sep 28 21:56:07 1998 --- gnusql-0.7b6.1/src/parse/parse.c.preserve Tue Sep 29 22:47:11 1998 *************** *** 123,129 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 123,129 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 145,151 **** * */ ! /* $Id: parse.y,v 1.247 1998/09/28 05:00:06 kimelman Exp $ */ #include "trl.h" #include "tree_gen.h" --- 145,151 ---- * */ ! /* $Id: parse.y,v 1.248 1998/09/29 21:26:34 kimelman Exp $ */ #include "trl.h" #include "tree_gen.h" diff -rc gnusql-0.7b6.0/src/parse/parse.y gnusql-0.7b6.1/src/parse/parse.y *** gnusql-0.7b6.0/src/parse/parse.y Mon Sep 28 01:02:26 1998 --- gnusql-0.7b6.1/src/parse/parse.y Tue Sep 29 17:26:34 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 27,33 **** * */ ! /* $Id: parse.y,v 1.247 1998/09/28 05:00:06 kimelman Exp $ */ #include "trl.h" #include "tree_gen.h" --- 27,33 ---- * */ ! /* $Id: parse.y,v 1.248 1998/09/29 21:26:34 kimelman Exp $ */ #include "trl.h" #include "tree_gen.h" diff -rc gnusql-0.7b6.0/src/parse/scan_c.c.preserve gnusql-0.7b6.1/src/parse/scan_c.c.preserve *** gnusql-0.7b6.0/src/parse/scan_c.c.preserve Mon Sep 28 21:56:07 1998 --- gnusql-0.7b6.1/src/parse/scan_c.c.preserve Tue Sep 29 22:47:12 1998 *************** *** 512,518 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 512,518 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 534,540 **** * */ ! /* $Id: scan_c.l,v 1.248 1997/10/16 10:01:17 kml Exp $ */ #include "xmem.h" #include "gsqltrn.h" --- 534,540 ---- * */ ! /* $Id: scan_c.l,v 1.249 1998/09/29 21:26:34 kimelman Exp $ */ #include "xmem.h" #include "gsqltrn.h" *************** *** 2379,2382 **** #ifndef yywrap int yywrap() { return 1; } #endif ! /*end of make-dist.tmp.13442/gnusql-0.7b6.0/src/parse/scan_c.c.preserve*/ --- 2379,2382 ---- #ifndef yywrap int yywrap() { return 1; } #endif ! /*end of make-dist.tmp.17704/gnusql-0.7b6.1/src/parse/scan_c.c.preserve*/ diff -rc gnusql-0.7b6.0/src/parse/scan_c.l gnusql-0.7b6.1/src/parse/scan_c.l *** gnusql-0.7b6.0/src/parse/scan_c.l Thu Oct 16 06:01:17 1997 --- gnusql-0.7b6.1/src/parse/scan_c.l Tue Sep 29 17:26:34 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman. * *************** *** 26,32 **** * */ ! /* $Id: scan_c.l,v 1.248 1997/10/16 10:01:17 kml Exp $ */ #include "xmem.h" #include "gsqltrn.h" --- 26,32 ---- * */ ! /* $Id: scan_c.l,v 1.249 1998/09/29 21:26:34 kimelman Exp $ */ #include "xmem.h" #include "gsqltrn.h" diff -rc gnusql-0.7b6.0/src/parse/scan_s.c.preserve gnusql-0.7b6.1/src/parse/scan_s.c.preserve *** gnusql-0.7b6.0/src/parse/scan_s.c.preserve Mon Sep 28 21:56:07 1998 --- gnusql-0.7b6.1/src/parse/scan_s.c.preserve Tue Sep 29 22:47:12 1998 *************** *** 791,797 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 791,797 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 813,819 **** * */ ! /* $Id: scan_s.l,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "xmem.h" #include "sql_decl.h" --- 813,819 ---- * */ ! /* $Id: scan_s.l,v 1.246 1998/09/29 21:26:35 kimelman Exp $ */ #include "xmem.h" #include "sql_decl.h" *************** *** 2859,2862 **** #ifndef yywrap int yywrap() { return 1; } #endif ! /*end of make-dist.tmp.13442/gnusql-0.7b6.0/src/parse/scan_s.c.preserve*/ --- 2859,2862 ---- #ifndef yywrap int yywrap() { return 1; } #endif ! /*end of make-dist.tmp.17704/gnusql-0.7b6.1/src/parse/scan_s.c.preserve*/ diff -rc gnusql-0.7b6.0/src/parse/scan_s.l gnusql-0.7b6.1/src/parse/scan_s.l *** gnusql-0.7b6.0/src/parse/scan_s.l Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/parse/scan_s.l Tue Sep 29 17:26:35 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: scan_s.l,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "xmem.h" #include "sql_decl.h" --- 26,32 ---- * */ ! /* $Id: scan_s.l,v 1.246 1998/09/29 21:26:35 kimelman Exp $ */ #include "xmem.h" #include "sql_decl.h" diff -rc gnusql-0.7b6.0/src/semantic/Makefile.in gnusql-0.7b6.1/src/semantic/Makefile.in *** gnusql-0.7b6.0/src/semantic/Makefile.in Mon Sep 28 02:09:30 1998 --- gnusql-0.7b6.1/src/semantic/Makefile.in Tue Sep 29 17:26:35 1998 *************** *** 2,12 **** ## GNU SQL Compiler (semantic pass) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.247 1998/09/28 06:03:08 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (semantic pass) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.248 1998/09/29 21:26:35 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/semantic/access.c gnusql-0.7b6.1/src/semantic/access.c *** gnusql-0.7b6.0/src/semantic/access.c Thu Apr 24 13:46:44 1997 --- gnusql-0.7b6.1/src/semantic/access.c Tue Sep 29 17:26:36 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Eugene W. Woynov, 1994 * Rewritten by Michael Kimelman, 1995 --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Eugene W. Woynov, 1994 * Rewritten by Michael Kimelman, 1995 *************** *** 28,34 **** * */ ! /* $Id: access.c,v 1.246 1997/04/24 17:46:44 kml Exp $ */ #include "setup_os.h" --- 28,34 ---- * */ ! /* $Id: access.c,v 1.247 1998/09/29 21:26:36 kimelman Exp $ */ #include "setup_os.h" diff -rc gnusql-0.7b6.0/src/semantic/binding.k gnusql-0.7b6.1/src/semantic/binding.k *** gnusql-0.7b6.0/src/semantic/binding.k Wed Sep 16 19:05:28 1998 --- gnusql-0.7b6.1/src/semantic/binding.k Tue Sep 29 18:23:46 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Eugene W. Woynov,1994 * Corrected by Michael Kimelman, 1995 --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Eugene W. Woynov,1994 * Corrected by Michael Kimelman, 1995 *************** *** 27,33 **** * */ ! /* $Id: binding.k,v 1.250 1998/09/16 23:05:28 kimelman Exp $ */ #include "global.h" #include "seman.h" --- 27,33 ---- * */ ! /* $Id: binding.k,v 1.252 1998/09/29 22:23:46 kimelman Exp $ */ #include "global.h" #include "seman.h" *************** *** 686,703 **** LTRLREF sn = COR_NAME(s); if (name_scan) ! if (sn) ! { ! if (IS_EQ(name_scan,sn)) ! EXIT("Error : Umbigous correlation name '%s'"); ! } ! else ! { ! if (IS_EQ(GL_AUTHOR,TBL_FNAME (t)) && ! IS_EQ(name_scan,TBL_NAME (t))) ! EXIT("Error : Umbigous correlation name '%s' -" ! "conflict with table name"); ! } else { if (sn) --- 686,705 ---- LTRLREF sn = COR_NAME(s); if (name_scan) ! { ! if (sn) ! { ! if (IS_EQ(name_scan,sn)) ! EXIT("Error : Umbigous correlation name '%s'"); ! } ! else ! { ! if (IS_EQ(GL_AUTHOR,TBL_FNAME (t)) && ! IS_EQ(name_scan,TBL_NAME (t))) ! EXIT("Error : Umbigous correlation name '%s' -" ! "conflict with table name"); ! } ! } else { if (sn) diff -rc gnusql-0.7b6.0/src/semantic/seman.h gnusql-0.7b6.1/src/semantic/seman.h *** gnusql-0.7b6.0/src/semantic/seman.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/semantic/seman.h Tue Sep 29 17:26:37 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * * This program is free software; you can redistribute it and/or modify *************** *** 24,30 **** * */ ! /* $Id: seman.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __SEMAN_H__ #define __SEMAN_H__ --- 24,30 ---- * */ ! /* $Id: seman.h,v 1.246 1998/09/29 21:26:37 kimelman Exp $ */ #ifndef __SEMAN_H__ #define __SEMAN_H__ diff -rc gnusql-0.7b6.0/src/synthes/Makefile.in gnusql-0.7b6.1/src/synthes/Makefile.in *** gnusql-0.7b6.0/src/synthes/Makefile.in Mon Sep 28 02:09:31 1998 --- gnusql-0.7b6.1/src/synthes/Makefile.in Tue Sep 29 17:26:39 1998 *************** *** 2,12 **** ## GNU SQL Compiler (Synthesys Stage) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.246 1998/09/28 06:03:08 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (Synthesys Stage) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.247 1998/09/29 21:26:39 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/synthes/codegen.c gnusql-0.7b6.1/src/synthes/codegen.c *** gnusql-0.7b6.0/src/synthes/codegen.c Mon Sep 28 20:39:41 1998 --- gnusql-0.7b6.1/src/synthes/codegen.c Tue Sep 29 18:23:47 1998 *************** *** 2,8 **** * codegen.c - functions of synthesator * (last part of compilator: result module generation). * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 2,8 ---- * codegen.c - functions of synthesator * (last part of compilator: result module generation). * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 24,30 **** * */ ! /* $Id: codegen.c,v 1.255 1998/09/29 00:39:41 kimelman Exp $ */ #include "global.h" #include "syndef.h" --- 24,30 ---- * */ ! /* $Id: codegen.c,v 1.257 1998/09/29 22:23:47 kimelman Exp $ */ #include "global.h" #include "syndef.h" *************** *** 1500,1507 **** } if (RIGHT_TRN (CurTab)) ! ScanTable (RIGHT_TRN (CurTab), UntilPtr, AndNum, AndTree, ! AndMasks, AllMsk, SelectNode, BO_Tid, ResScan, CmdNode); else { /* here is a body of all circles : codes for * --- 1500,1509 ---- } if (RIGHT_TRN (CurTab)) ! { ! ScanTable (RIGHT_TRN (CurTab), UntilPtr, AndNum, AndTree, ! AndMasks, AllMsk, SelectNode, BO_Tid, ResScan, CmdNode); ! } else { /* here is a body of all circles : codes for * *************** *** 1535,1559 **** if (!CmdNode || sel_stmt_fl) Pr_RetPar (TreeTab, TreeN, !sel_stmt_fl); ! if (CmdNode && !sel_stmt_fl) ! if (Is_SQPredicate_Code (CODE_TRN (CmdNode))) ! SQ_Handle (CmdNode, DOWN_TRN (SelectNode), ARITY_TRN (SelectNode)); ! else ! switch (CODE_TRN (CmdNode)) ! { ! case DELETE : ! Pr_DELETE (Scan, (real_insert_scan) ? VNULL : ScanNode); ! break; ! ! case UPDATE : ! sc_mode = (sc_mode == DSC) ? WSC : MSC; /* MODIFICATION */ ! prepare_UPD (CmdNode, &nm, &V_mlist); ! Pr_UPDATE (Scan, nm, TreeTab, ScanNode, V_mlist); ! break; ! ! default : ! TASSERT (0, CmdNode); ! } } if (Tbid) /* There is table scanning */ --- 1537,1563 ---- if (!CmdNode || sel_stmt_fl) Pr_RetPar (TreeTab, TreeN, !sel_stmt_fl); ! if (CmdNode && !sel_stmt_fl) ! { ! if (Is_SQPredicate_Code (CODE_TRN (CmdNode))) ! SQ_Handle (CmdNode, DOWN_TRN (SelectNode), ARITY_TRN (SelectNode)); ! else ! switch (CODE_TRN (CmdNode)) ! { ! case DELETE : ! Pr_DELETE (Scan, (real_insert_scan) ? VNULL : ScanNode); ! break; ! ! case UPDATE : ! sc_mode = (sc_mode == DSC) ? WSC : MSC; /* MODIFICATION */ ! prepare_UPD (CmdNode, &nm, &V_mlist); ! Pr_UPDATE (Scan, nm, TreeTab, ScanNode, V_mlist); ! break; ! ! default : ! TASSERT (0, CmdNode); ! } ! } } if (Tbid) /* There is table scanning */ diff -rc gnusql-0.7b6.0/src/synthes/moddump.c gnusql-0.7b6.1/src/synthes/moddump.c *** gnusql-0.7b6.0/src/synthes/moddump.c Wed Nov 5 11:26:29 1997 --- gnusql-0.7b6.1/src/synthes/moddump.c Tue Sep 29 17:26:40 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 25,31 **** * */ ! /* $Id: moddump.c,v 1.250 1997/11/05 16:26:29 kml Exp $ */ #include "global.h" #include "syndef.h" --- 25,31 ---- * */ ! /* $Id: moddump.c,v 1.251 1998/09/29 21:26:40 kimelman Exp $ */ #include "global.h" #include "syndef.h" diff -rc gnusql-0.7b6.0/src/synthes/optim.c gnusql-0.7b6.1/src/synthes/optim.c *** gnusql-0.7b6.0/src/synthes/optim.c Tue Jun 9 13:47:58 1998 --- gnusql-0.7b6.1/src/synthes/optim.c Tue Sep 29 18:23:48 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * *************** *** 25,31 **** * */ ! /* $Id: optim.c,v 1.250 1998/06/09 17:47:58 kimelman Exp $ */ #include "global.h" #include "syndef.h" --- 25,31 ---- * */ ! /* $Id: optim.c,v 1.252 1998/09/29 22:23:48 kimelman Exp $ */ #include "global.h" #include "syndef.h" *************** *** 699,734 **** } /* for : tbl_num - tables handling finished */ if (number_of_disjuncts) ! if (!unused_prdc) /* WHERE must be deleted */ ! { ! free_tree (RIGHT_TRN (SelectNode)); ! RIGHT_TRN (SelectNode) = TNULL; ! } ! else ! { /* all unused disjuncts must be saved in WHERE */ ! for (fir_el = TNULL, prdc_num = 0; prdc_num < number_of_disjuncts; prdc_num++) ! if (!SPs[prdc_num].flag) ! /* this predicate was not used as simple one */ ! if (fir_el) ! last_el = RIGHT_TRN (last_el) = SPs[prdc_num].SP_Trees; ! else ! fir_el = last_el = SPs[prdc_num].SP_Trees; ! ! assert (fir_el && last_el); ! RIGHT_TRN (last_el) = TNULL; ! ! if (unused_prdc > 1) ! { ! WhereNode = DOWN_TRN (WhereNode); ! TASSERT (CODE_TRN (WhereNode) == AND, WhereNode); ! } ! else ! if (CODE_TRN (WhereTree) == AND) ! free_node (WhereTree); ! ! DOWN_TRN (WhereNode) = fir_el; ! } ! if (col_stat) xfree (col_stat); if (SPs) --- 699,737 ---- } /* for : tbl_num - tables handling finished */ if (number_of_disjuncts) ! { ! if (!unused_prdc) /* WHERE must be deleted */ ! { ! free_tree (RIGHT_TRN (SelectNode)); ! RIGHT_TRN (SelectNode) = TNULL; ! } ! else ! { /* all unused disjuncts must be saved in WHERE */ ! for (fir_el = TNULL, prdc_num = 0; prdc_num < number_of_disjuncts; prdc_num++) ! if (!SPs[prdc_num].flag) ! { ! /* this predicate was not used as simple one */ ! if (fir_el) ! last_el = RIGHT_TRN (last_el) = SPs[prdc_num].SP_Trees; ! else ! fir_el = last_el = SPs[prdc_num].SP_Trees; ! } ! ! assert (fir_el && last_el); ! RIGHT_TRN (last_el) = TNULL; ! ! if (unused_prdc > 1) ! { ! WhereNode = DOWN_TRN (WhereNode); ! TASSERT (CODE_TRN (WhereNode) == AND, WhereNode); ! } ! else ! if (CODE_TRN (WhereTree) == AND) ! free_node (WhereTree); ! ! DOWN_TRN (WhereNode) = fir_el; ! } ! } if (col_stat) xfree (col_stat); if (SPs) diff -rc gnusql-0.7b6.0/src/synthes/repack.c gnusql-0.7b6.1/src/synthes/repack.c *** gnusql-0.7b6.0/src/synthes/repack.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/synthes/repack.c Tue Sep 29 17:26:42 1998 *************** *** 5,11 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin * --- 5,11 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Andrew Yahin * *************** *** 27,33 **** * */ ! /* $Id: repack.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "global.h" #include "tassert.h" --- 27,33 ---- * */ ! /* $Id: repack.c,v 1.246 1998/09/29 21:26:42 kimelman Exp $ */ #include "global.h" #include "tassert.h" diff -rc gnusql-0.7b6.0/src/synthes/struct.c gnusql-0.7b6.1/src/synthes/struct.c *** gnusql-0.7b6.0/src/synthes/struct.c Wed Sep 16 18:51:36 1998 --- gnusql-0.7b6.1/src/synthes/struct.c Tue Sep 29 17:26:42 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 26,32 **** * */ ! /* $Id: struct.c,v 1.250 1998/09/16 22:51:36 kimelman Exp $ */ #include "global.h" #include "syndef.h" --- 26,32 ---- * */ ! /* $Id: struct.c,v 1.251 1998/09/29 21:26:42 kimelman Exp $ */ #include "global.h" #include "syndef.h" diff -rc gnusql-0.7b6.0/src/synthes/syndef.h gnusql-0.7b6.1/src/synthes/syndef.h *** gnusql-0.7b6.0/src/synthes/syndef.h Mon Sep 28 20:39:42 1998 --- gnusql-0.7b6.1/src/synthes/syndef.h Tue Sep 29 17:26:43 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoj * *************** *** 26,32 **** * */ ! /* $Id: syndef.h,v 1.247 1998/09/29 00:39:42 kimelman Exp $ */ #ifndef __SYNDEF_H__ #define __SYNDEF_H__ --- 26,32 ---- * */ ! /* $Id: syndef.h,v 1.248 1998/09/29 21:26:43 kimelman Exp $ */ #ifndef __SYNDEF_H__ #define __SYNDEF_H__ diff -rc gnusql-0.7b6.0/src/synthes/synlib.c gnusql-0.7b6.1/src/synthes/synlib.c *** gnusql-0.7b6.0/src/synthes/synlib.c Wed May 20 01:58:20 1998 --- gnusql-0.7b6.1/src/synthes/synlib.c Tue Sep 29 18:23:50 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Konstantin Dyshlevoi * *************** *** 26,32 **** * */ ! /* $Id: synlib.c,v 1.246 1998/05/20 05:58:20 kml Exp $ */ #include "global.h" #include "syndef.h" --- 26,32 ---- * */ ! /* $Id: synlib.c,v 1.248 1998/09/29 22:23:50 kimelman Exp $ */ #include "global.h" #include "syndef.h" *************** *** 57,82 **** *SQ_deps = 0; *SQ_cost = 0.0; ! if (Node) ! if (CODE_TRN (Node) == COLPTR) ! deps = COR_MASK (COL_TBL (OBJ_DESC (Node))); ! else ! if (Is_SQPredicate_Code (CODE_TRN (Node))) ! { ! Tr_RecLoad (Node, SQ_deps, 0, SQ_cost); ! deps = *SQ_deps; ! } ! else ! if (HAS_DOWN (Node)) ! for (cur_son = DOWN_TRN (Node); ! cur_son; cur_son = RIGHT_TRN (cur_son)) ! { ! cur_deps = see_deps (cur_son, &cur_sq_deps, &cur_sq_cost); ! deps = BitOR (deps, cur_deps); ! *SQ_deps = BitOR (*SQ_deps, cur_sq_deps); ! *SQ_cost += cur_sq_cost; ! } return deps; } /* see_deps */ --- 57,81 ---- *SQ_deps = 0; *SQ_cost = 0.0; ! if (!Node) ! return 0; + if (CODE_TRN (Node) == COLPTR) + deps = COR_MASK (COL_TBL (OBJ_DESC (Node))); + else if (Is_SQPredicate_Code (CODE_TRN (Node))) + { + Tr_RecLoad (Node, SQ_deps, 0, SQ_cost); + deps = *SQ_deps; + } + else if (HAS_DOWN (Node)) + for (cur_son = DOWN_TRN (Node); + cur_son; cur_son = RIGHT_TRN (cur_son)) + { + cur_deps = see_deps (cur_son, &cur_sq_deps, &cur_sq_cost); + deps = BitOR (deps, cur_deps); + *SQ_deps = BitOR (*SQ_deps, cur_sq_deps); + *SQ_cost += cur_sq_cost; + } return deps; } /* see_deps */ diff -rc gnusql-0.7b6.0/src/trl/Makefile.in gnusql-0.7b6.1/src/trl/Makefile.in *** gnusql-0.7b6.0/src/trl/Makefile.in Mon Sep 28 20:39:43 1998 --- gnusql-0.7b6.1/src/trl/Makefile.in Tue Sep 29 17:26:44 1998 *************** *** 2,12 **** ## GNU SQL Compiler (Tree Library) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.247 1998/09/29 00:39:43 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 2,12 ---- ## GNU SQL Compiler (Tree Library) ## ########################################################################## ## ! ## $Id: Makefile.in,v 1.248 1998/09/29 21:26:44 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## diff -rc gnusql-0.7b6.0/src/trl/cycler.c gnusql-0.7b6.1/src/trl/cycler.c *** gnusql-0.7b6.0/src/trl/cycler.c Wed May 20 01:59:03 1998 --- gnusql-0.7b6.1/src/trl/cycler.c Tue Sep 29 17:26:45 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: cycler.c,v 1.246 1998/05/20 05:59:03 kml Exp $ */ #include "cycler.h" --- 25,31 ---- * */ ! /* $Id: cycler.c,v 1.247 1998/09/29 21:26:45 kimelman Exp $ */ #include "cycler.h" diff -rc gnusql-0.7b6.0/src/trl/liter.c gnusql-0.7b6.1/src/trl/liter.c *** gnusql-0.7b6.0/src/trl/liter.c Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/trl/liter.c Tue Sep 29 17:26:45 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: liter.c,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "liter.h" #include "trlinter.h" --- 25,31 ---- * */ ! /* $Id: liter.c,v 1.246 1998/09/29 21:26:45 kimelman Exp $ */ #include "liter.h" #include "trlinter.h" diff -rc gnusql-0.7b6.0/src/trl/liter.h gnusql-0.7b6.1/src/trl/liter.h *** gnusql-0.7b6.0/src/trl/liter.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/trl/liter.h Tue Sep 29 17:26:46 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: liter.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __LITER_H__ #define __LITER_H__ --- 25,31 ---- * */ ! /* $Id: liter.h,v 1.246 1998/09/29 21:26:46 kimelman Exp $ */ #ifndef __LITER_H__ #define __LITER_H__ diff -rc gnusql-0.7b6.0/src/trl/tree_gen.c gnusql-0.7b6.1/src/trl/tree_gen.c *** gnusql-0.7b6.0/src/trl/tree_gen.c Fri Oct 3 12:16:29 1997 --- gnusql-0.7b6.1/src/trl/tree_gen.c Tue Sep 29 17:26:47 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: tree_gen.c,v 1.247 1997/10/03 16:16:29 kml Exp $ */ #include "tree_gen.h" #include "type_lib.h" --- 26,32 ---- * */ ! /* $Id: tree_gen.c,v 1.248 1998/09/29 21:26:47 kimelman Exp $ */ #include "tree_gen.h" #include "type_lib.h" diff -rc gnusql-0.7b6.0/src/trl/treecode.def gnusql-0.7b6.1/src/trl/treecode.def *** gnusql-0.7b6.0/src/trl/treecode.def Wed Sep 16 18:51:37 1998 --- gnusql-0.7b6.1/src/trl/treecode.def Tue Sep 29 17:26:48 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: treecode.def,v 1.246 1998/09/16 22:51:37 kimelman Exp $ */ /*************************************************************************. * Each used by compiler tree node has to described here in the * --- 26,32 ---- * */ ! /* $Id: treecode.def,v 1.247 1998/09/29 21:26:48 kimelman Exp $ */ /*************************************************************************. * Each used by compiler tree node has to described here in the * diff -rc gnusql-0.7b6.0/src/trl/treeflag.def gnusql-0.7b6.1/src/trl/treeflag.def *** gnusql-0.7b6.0/src/trl/treeflag.def Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/trl/treeflag.def Tue Sep 29 17:26:48 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: treeflag.def,v 1.245 1997/03/31 03:46:38 kml Exp $ */ /*************************************************************************\ * All flags used in the tree nodes has to be described in this file. * --- 26,32 ---- * */ ! /* $Id: treeflag.def,v 1.246 1998/09/29 21:26:48 kimelman Exp $ */ /*************************************************************************\ * All flags used in the tree nodes has to be described in this file. * diff -rc gnusql-0.7b6.0/src/trl/trl.c gnusql-0.7b6.1/src/trl/trl.c *** gnusql-0.7b6.0/src/trl/trl.c Wed Jul 29 23:23:40 1998 --- gnusql-0.7b6.1/src/trl/trl.c Tue Sep 29 17:26:49 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: trl.c,v 1.248 1998/07/30 03:23:40 kimelman Exp $ */ #include "vmemory.h" --- 25,31 ---- * */ ! /* $Id: trl.c,v 1.249 1998/09/29 21:26:49 kimelman Exp $ */ #include "vmemory.h" diff -rc gnusql-0.7b6.0/src/trl/trl.h gnusql-0.7b6.1/src/trl/trl.h *** gnusql-0.7b6.0/src/trl/trl.h Mon Sep 28 20:23:15 1998 --- gnusql-0.7b6.1/src/trl/trl.h Tue Sep 29 21:28:36 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: trl.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __TRL_H__ #define __TRL_H__ --- 25,31 ---- * */ ! /* $Id: trl.h,v 1.246 1998/09/29 21:26:50 kimelman Exp $ */ #ifndef __TRL_H__ #define __TRL_H__ diff -rc gnusql-0.7b6.0/src/trl/trl_dump.c gnusql-0.7b6.1/src/trl/trl_dump.c *** gnusql-0.7b6.0/src/trl/trl_dump.c Mon Mar 31 06:01:48 1997 --- gnusql-0.7b6.1/src/trl/trl_dump.c Tue Sep 29 18:23:51 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: trl_dump.c,v 1.246 1997/03/31 11:01:48 kml Exp $ */ #include #include "trl.h" --- 26,32 ---- * */ ! /* $Id: trl_dump.c,v 1.248 1998/09/29 22:23:51 kimelman Exp $ */ #include #include "trl.h" *************** *** 887,906 **** break; } if (i < VCB_F) ! if ((*tmp_char >= '0') && (*tmp_char <= '9')) ! { ! i4_t v; ! if (1 == sscanf (tmp_char, "%d", &v)) ! msk |= (v > 14 ? 0 : v + 1); ! else ! yyerror ("Unexpected 'op' flag\n"); ! } ! else ! { ! fprintf (STDERR, "trl_read: unrecognized flag '%s' in line %d\n", ! tmp_char, line_num); ! errors++; ! } c = read_skip_spaces (); } ungetc (c, infile); --- 887,908 ---- break; } if (i < VCB_F) ! { ! if ((*tmp_char >= '0') && (*tmp_char <= '9')) ! { ! int v; ! if (1 == sscanf (tmp_char, "%d", &v)) ! msk |= (v > 14 ? 0 : v + 1); ! else ! yyerror ("Unexpected 'op' flag\n"); ! } ! else ! { ! fprintf (STDERR, "trl_read: unrecognized flag '%s' in line %d\n", ! tmp_char, line_num); ! errors++; ! } ! } c = read_skip_spaces (); } ungetc (c, infile); *************** *** 962,974 **** { register TXTREF x = read_trn_l (); if (msk) ! if (CODE_TRN (x) == SKIP_CODE) ! { ! free_node (x); ! x = TNULL; ! } ! else ! SET_PAT_BIT (i); XTXT_TRN (return_trn, i) = x; } break; --- 964,978 ---- { register TXTREF x = read_trn_l (); if (msk) ! { ! if (CODE_TRN (x) == SKIP_CODE) ! { ! free_node (x); ! x = TNULL; ! } ! else ! SET_PAT_BIT (i); ! } XTXT_TRN (return_trn, i) = x; } break; diff -rc gnusql-0.7b6.0/src/trl/trl_macro.h gnusql-0.7b6.1/src/trl/trl_macro.h *** gnusql-0.7b6.0/src/trl/trl_macro.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/trl/trl_macro.h Tue Sep 29 17:26:52 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: trl_macro.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __TRL_macro_H__ #define __TRL_macro_H__ --- 26,32 ---- * */ ! /* $Id: trl_macro.h,v 1.246 1998/09/29 21:26:52 kimelman Exp $ */ #ifndef __TRL_macro_H__ #define __TRL_macro_H__ diff -rc gnusql-0.7b6.0/src/trl/trlinter.h gnusql-0.7b6.1/src/trl/trlinter.h *** gnusql-0.7b6.0/src/trl/trlinter.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/trl/trlinter.h Tue Sep 29 17:26:52 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman * *************** *** 25,31 **** * */ ! /* $Id: trlinter.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #ifndef __TRLINTER_H__ #define __TRLINTER_H__ --- 25,31 ---- * */ ! /* $Id: trlinter.h,v 1.246 1998/09/29 21:26:52 kimelman Exp $ */ #ifndef __TRLINTER_H__ #define __TRLINTER_H__ diff -rc gnusql-0.7b6.0/src/trl/vcblib.c gnusql-0.7b6.1/src/trl/vcblib.c *** gnusql-0.7b6.0/src/trl/vcblib.c Tue Sep 15 01:08:44 1998 --- gnusql-0.7b6.1/src/trl/vcblib.c Tue Sep 29 18:23:52 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, * This file is written by Michael Kimelman * *************** *** 26,32 **** * */ ! /* $Id: vcblib.c,v 1.246 1998/09/15 05:08:44 kimelman Exp $ */ #include "trl.h" #include "vcblib.h" --- 26,32 ---- * */ ! /* $Id: vcblib.c,v 1.248 1998/09/29 22:23:52 kimelman Exp $ */ #include "trl.h" #include "vcblib.h" *************** *** 253,259 **** TBL_FNAME(v)=GL_AUTHOR; if(TBL_NAME(v)==TNULL) { ! static tmptblno=0; char b[40]; sprintf(b,"tmp%d",++tmptblno); TBL_NAME(v)=ltr_rec(b); --- 253,259 ---- TBL_FNAME(v)=GL_AUTHOR; if(TBL_NAME(v)==TNULL) { ! static int tmptblno=0; char b[40]; sprintf(b,"tmp%d",++tmptblno); TBL_NAME(v)=ltr_rec(b); *************** *** 271,280 **** while(vcb) { if((CODE_TRN(vcb)==SCAN) && (COR_TBL(vcb)==COR_TBL(v))) ! if (COR_NO(vcb) == COR_NO(v)) ! return vcb; ! else if ( ins_no <= COR_NO(vcb) ) ! ins_no = COR_NO(vcb) + 1; vcb=RIGHT_TRN(vcb); } if(COR_NO(v) <0) --- 271,282 ---- while(vcb) { if((CODE_TRN(vcb)==SCAN) && (COR_TBL(vcb)==COR_TBL(v))) ! { ! if (COR_NO(vcb) == COR_NO(v)) ! return vcb; ! else if ( ins_no <= COR_NO(vcb) ) ! ins_no = COR_NO(vcb) + 1; ! } vcb=RIGHT_TRN(vcb); } if(COR_NO(v) <0) diff -rc gnusql-0.7b6.0/src/trl/vcblib.h gnusql-0.7b6.1/src/trl/vcblib.h *** gnusql-0.7b6.0/src/trl/vcblib.h Sun Mar 30 22:46:38 1997 --- gnusql-0.7b6.1/src/trl/vcblib.h Tue Sep 29 17:26:54 1998 *************** *** 4,10 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, * This file is written by Michael Kimelman * --- 4,10 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, * This file is written by Michael Kimelman * *************** *** 30,36 **** #ifndef __VCBLIB_H__ #define __VCBLIB_H__ ! /* $Id: vcblib.h,v 1.245 1997/03/31 03:46:38 kml Exp $ */ #include "trl.h" /*------------------------------------------------------------------------\ --- 30,36 ---- #ifndef __VCBLIB_H__ #define __VCBLIB_H__ ! /* $Id: vcblib.h,v 1.246 1998/09/29 21:26:54 kimelman Exp $ */ #include "trl.h" /*------------------------------------------------------------------------\ diff -rc gnusql-0.7b6.0/test/Makefile.in gnusql-0.7b6.1/test/Makefile.in *** gnusql-0.7b6.0/test/Makefile.in Mon Sep 28 02:09:32 1998 --- gnusql-0.7b6.1/test/Makefile.in Tue Sep 29 17:26:55 1998 *************** *** 1,9 **** ## ! ## $Id: Makefile.in,v 1.254 1998/09/28 06:03:08 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996, 1997, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## --- 1,9 ---- ## ! ## $Id: Makefile.in,v 1.255 1998/09/29 21:26:55 kimelman Exp $ ## ## This file is a part of GNU SQL Server ## ! ## Copyright (c) 1996-1998, Free Software Foundation, Inc ## Developed at Institute of System Programming of Russian Academy of Science ## This file is written by Michael Kimelman ## Only in gnusql-0.7b6.0/test: log.2 diff -rc gnusql-0.7b6.0/test/test10.ec gnusql-0.7b6.1/test/test10.ec *** gnusql-0.7b6.0/test/test10.ec Mon Jan 19 01:14:41 1998 --- gnusql-0.7b6.1/test/test10.ec Tue Sep 29 17:26:55 1998 *************** *** 1,9 **** /* ! * $Id: test10.ec,v 1.1 1998/01/19 06:14:41 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test10.ec,v 1.2 1998/09/29 21:26:55 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test11.ec gnusql-0.7b6.1/test/test11.ec *** gnusql-0.7b6.0/test/test11.ec Mon Jan 19 01:14:41 1998 --- gnusql-0.7b6.1/test/test11.ec Tue Sep 29 17:26:55 1998 *************** *** 1,9 **** /* ! * $Id: test11.ec,v 1.1 1998/01/19 06:14:41 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test11.ec,v 1.2 1998/09/29 21:26:55 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test12.ec gnusql-0.7b6.1/test/test12.ec *** gnusql-0.7b6.0/test/test12.ec Mon Jan 19 01:14:41 1998 --- gnusql-0.7b6.1/test/test12.ec Tue Sep 29 17:26:56 1998 *************** *** 1,9 **** /* ! * $Id: test12.ec,v 1.1 1998/01/19 06:14:41 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test12.ec,v 1.2 1998/09/29 21:26:56 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test13.ec gnusql-0.7b6.1/test/test13.ec *** gnusql-0.7b6.0/test/test13.ec Mon Jan 19 01:14:41 1998 --- gnusql-0.7b6.1/test/test13.ec Tue Sep 29 17:26:56 1998 *************** *** 1,9 **** /* ! * $Id: test13.ec,v 1.1 1998/01/19 06:14:41 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test13.ec,v 1.2 1998/09/29 21:26:56 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test14.ec gnusql-0.7b6.1/test/test14.ec *** gnusql-0.7b6.0/test/test14.ec Mon Jan 19 01:14:41 1998 --- gnusql-0.7b6.1/test/test14.ec Tue Sep 29 17:26:57 1998 *************** *** 1,9 **** /* ! * $Id: test14.ec,v 1.1 1998/01/19 06:14:41 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test14.ec,v 1.2 1998/09/29 21:26:57 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test15.ec gnusql-0.7b6.1/test/test15.ec *** gnusql-0.7b6.0/test/test15.ec Mon Jan 19 01:14:41 1998 --- gnusql-0.7b6.1/test/test15.ec Tue Sep 29 17:26:57 1998 *************** *** 1,9 **** /* ! * $Id: test15.ec,v 1.1 1998/01/19 06:14:41 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test15.ec,v 1.2 1998/09/29 21:26:57 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test16.ec gnusql-0.7b6.1/test/test16.ec *** gnusql-0.7b6.0/test/test16.ec Mon Jan 19 01:14:42 1998 --- gnusql-0.7b6.1/test/test16.ec Tue Sep 29 17:26:58 1998 *************** *** 1,9 **** /* ! * $Id: test16.ec,v 1.1 1998/01/19 06:14:42 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test16.ec,v 1.2 1998/09/29 21:26:58 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test20.ec gnusql-0.7b6.1/test/test20.ec *** gnusql-0.7b6.0/test/test20.ec Mon Jan 19 01:14:42 1998 --- gnusql-0.7b6.1/test/test20.ec Tue Sep 29 17:26:58 1998 *************** *** 1,9 **** /* ! * $Id: test20.ec,v 1.1 1998/01/19 06:14:42 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test20.ec,v 1.2 1998/09/29 21:26:58 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test21.ec gnusql-0.7b6.1/test/test21.ec *** gnusql-0.7b6.0/test/test21.ec Mon Jan 19 01:14:42 1998 --- gnusql-0.7b6.1/test/test21.ec Tue Sep 29 17:26:58 1998 *************** *** 1,9 **** /* ! * $Id: test21.ec,v 1.1 1998/01/19 06:14:42 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test21.ec,v 1.2 1998/09/29 21:26:58 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test22.ec gnusql-0.7b6.1/test/test22.ec *** gnusql-0.7b6.0/test/test22.ec Mon Jan 19 01:14:42 1998 --- gnusql-0.7b6.1/test/test22.ec Tue Sep 29 17:26:59 1998 *************** *** 1,9 **** /* ! * $Id: test22.ec,v 1.1 1998/01/19 06:14:42 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test22.ec,v 1.2 1998/09/29 21:26:59 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test23.ec gnusql-0.7b6.1/test/test23.ec *** gnusql-0.7b6.0/test/test23.ec Mon Jun 1 11:13:06 1998 --- gnusql-0.7b6.1/test/test23.ec Tue Sep 29 17:26:59 1998 *************** *** 1,9 **** /* ! * $Id: test23.ec,v 1.2 1998/06/01 15:13:06 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test23.ec,v 1.3 1998/09/29 21:26:59 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test24.ec gnusql-0.7b6.1/test/test24.ec *** gnusql-0.7b6.0/test/test24.ec Mon Jan 19 01:14:42 1998 --- gnusql-0.7b6.1/test/test24.ec Tue Sep 29 17:27:00 1998 *************** *** 1,9 **** /* ! * $Id: test24.ec,v 1.1 1998/01/19 06:14:42 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test24.ec,v 1.2 1998/09/29 21:27:00 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test25.ec gnusql-0.7b6.1/test/test25.ec *** gnusql-0.7b6.0/test/test25.ec Mon Jan 19 01:14:43 1998 --- gnusql-0.7b6.1/test/test25.ec Tue Sep 29 17:27:00 1998 *************** *** 1,9 **** /* ! * $Id: test25.ec,v 1.1 1998/01/19 06:14:43 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test25.ec,v 1.2 1998/09/29 21:27:00 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test26.ec gnusql-0.7b6.1/test/test26.ec *** gnusql-0.7b6.0/test/test26.ec Mon Jan 19 01:14:43 1998 --- gnusql-0.7b6.1/test/test26.ec Tue Sep 29 17:27:00 1998 *************** *** 1,9 **** /* ! * $Id: test26.ec,v 1.1 1998/01/19 06:14:43 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test26.ec,v 1.2 1998/09/29 21:27:00 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test30.ec gnusql-0.7b6.1/test/test30.ec *** gnusql-0.7b6.0/test/test30.ec Mon Jun 1 11:13:07 1998 --- gnusql-0.7b6.1/test/test30.ec Tue Sep 29 17:27:01 1998 *************** *** 1,9 **** /* ! * $Id: test30.ec,v 1.2 1998/06/01 15:13:07 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test30.ec,v 1.3 1998/09/29 21:27:01 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test31.ec gnusql-0.7b6.1/test/test31.ec *** gnusql-0.7b6.0/test/test31.ec Mon Jan 19 01:14:43 1998 --- gnusql-0.7b6.1/test/test31.ec Tue Sep 29 17:27:01 1998 *************** *** 1,9 **** /* ! * $Id: test31.ec,v 1.1 1998/01/19 06:14:43 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test31.ec,v 1.2 1998/09/29 21:27:01 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test33.ec gnusql-0.7b6.1/test/test33.ec *** gnusql-0.7b6.0/test/test33.ec Mon Jan 19 01:14:43 1998 --- gnusql-0.7b6.1/test/test33.ec Tue Sep 29 17:27:02 1998 *************** *** 1,9 **** /* ! * $Id: test33.ec,v 1.1 1998/01/19 06:14:43 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test33.ec,v 1.2 1998/09/29 21:27:02 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test3a.ec gnusql-0.7b6.1/test/test3a.ec *** gnusql-0.7b6.0/test/test3a.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test3a.ec Tue Sep 29 17:27:02 1998 *************** *** 1,9 **** /* ! * $Id: test3a.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test3a.ec,v 1.2 1998/09/29 21:27:02 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test3b.ec gnusql-0.7b6.1/test/test3b.ec *** gnusql-0.7b6.0/test/test3b.ec Mon Jun 1 11:13:08 1998 --- gnusql-0.7b6.1/test/test3b.ec Tue Sep 29 17:27:03 1998 *************** *** 1,9 **** /* ! * $Id: test3b.ec,v 1.2 1998/06/01 15:13:08 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test3b.ec,v 1.3 1998/09/29 21:27:03 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test3c.ec gnusql-0.7b6.1/test/test3c.ec *** gnusql-0.7b6.0/test/test3c.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test3c.ec Tue Sep 29 17:27:03 1998 *************** *** 1,9 **** /* ! * $Id: test3c.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test3c.ec,v 1.2 1998/09/29 21:27:03 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test40.ec gnusql-0.7b6.1/test/test40.ec *** gnusql-0.7b6.0/test/test40.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test40.ec Tue Sep 29 17:27:03 1998 *************** *** 1,9 **** /* ! * $Id: test40.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test40.ec,v 1.2 1998/09/29 21:27:03 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test41.ec gnusql-0.7b6.1/test/test41.ec *** gnusql-0.7b6.0/test/test41.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test41.ec Tue Sep 29 17:27:04 1998 *************** *** 1,9 **** /* ! * $Id: test41.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test41.ec,v 1.2 1998/09/29 21:27:04 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test42.ec gnusql-0.7b6.1/test/test42.ec *** gnusql-0.7b6.0/test/test42.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test42.ec Tue Sep 29 17:27:04 1998 *************** *** 1,9 **** /* ! * $Id: test42.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test42.ec,v 1.2 1998/09/29 21:27:04 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test50.ec gnusql-0.7b6.1/test/test50.ec *** gnusql-0.7b6.0/test/test50.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test50.ec Tue Sep 29 17:27:05 1998 *************** *** 1,9 **** /* ! * $Id: test50.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test50.ec,v 1.2 1998/09/29 21:27:05 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test51.ec gnusql-0.7b6.1/test/test51.ec *** gnusql-0.7b6.0/test/test51.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test51.ec Tue Sep 29 17:27:05 1998 *************** *** 1,9 **** /* ! * $Id: test51.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test51.ec,v 1.2 1998/09/29 21:27:05 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test70.ec gnusql-0.7b6.1/test/test70.ec *** gnusql-0.7b6.0/test/test70.ec Mon Jan 19 01:14:44 1998 --- gnusql-0.7b6.1/test/test70.ec Tue Sep 29 17:27:05 1998 *************** *** 1,9 **** /* ! * $Id: test70.ec,v 1.1 1998/01/19 06:14:44 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test70.ec,v 1.2 1998/09/29 21:27:05 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/test80.ec gnusql-0.7b6.1/test/test80.ec *** gnusql-0.7b6.0/test/test80.ec Mon Jan 19 01:14:45 1998 --- gnusql-0.7b6.1/test/test80.ec Tue Sep 29 17:27:06 1998 *************** *** 1,9 **** /* ! * $Id: test80.ec,v 1.1 1998/01/19 06:14:45 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: test80.ec,v 1.2 1998/09/29 21:27:06 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testM1.ec gnusql-0.7b6.1/test/testM1.ec *** gnusql-0.7b6.0/test/testM1.ec Fri Sep 11 15:53:26 1998 --- gnusql-0.7b6.1/test/testM1.ec Tue Sep 29 17:27:06 1998 *************** *** 1,9 **** /* ! * $Id: testM1.ec,v 1.6 1998/09/11 19:53:26 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * --- 1,9 ---- /* ! * $Id: testM1.ec,v 1.7 1998/09/29 21:27:06 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * *************** *** 24,29 **** --- 24,32 ---- * Contacts: gss@ispras.ru * * $Log: testM1.ec,v $ + * Revision 1.7 1998/09/29 21:27:06 kimelman + * copyright years fixed + * * Revision 1.6 1998/09/11 19:53:26 kimelman * add log mark * diff -rc gnusql-0.7b6.0/test/testM1a.ec gnusql-0.7b6.1/test/testM1a.ec *** gnusql-0.7b6.0/test/testM1a.ec Mon Jan 19 01:14:46 1998 --- gnusql-0.7b6.1/test/testM1a.ec Tue Sep 29 17:27:07 1998 *************** *** 1,9 **** /* ! * $Id: testM1a.ec,v 1.1 1998/01/19 06:14:46 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * --- 1,9 ---- /* ! * $Id: testM1a.ec,v 1.2 1998/09/29 21:27:07 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * diff -rc gnusql-0.7b6.0/test/testM2.ec gnusql-0.7b6.1/test/testM2.ec *** gnusql-0.7b6.0/test/testM2.ec Mon Jan 19 01:14:46 1998 --- gnusql-0.7b6.1/test/testM2.ec Tue Sep 29 17:27:07 1998 *************** *** 1,9 **** /* ! * $Id: testM2.ec,v 1.1 1998/01/19 06:14:46 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * --- 1,9 ---- /* ! * $Id: testM2.ec,v 1.2 1998/09/29 21:27:07 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * diff -rc gnusql-0.7b6.0/test/testM3.ec gnusql-0.7b6.1/test/testM3.ec *** gnusql-0.7b6.0/test/testM3.ec Fri Sep 11 15:49:06 1998 --- gnusql-0.7b6.1/test/testM3.ec Tue Sep 29 17:27:07 1998 *************** *** 1,9 **** /* ! * $Id: testM3.ec,v 1.2 1998/09/11 19:49:06 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * --- 1,9 ---- /* ! * $Id: testM3.ec,v 1.3 1998/09/29 21:27:07 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * diff -rc gnusql-0.7b6.0/test/testM4.ec gnusql-0.7b6.1/test/testM4.ec *** gnusql-0.7b6.0/test/testM4.ec Mon Jan 19 01:14:46 1998 --- gnusql-0.7b6.1/test/testM4.ec Tue Sep 29 17:27:08 1998 *************** *** 1,9 **** /* ! * $Id: testM4.ec,v 1.1 1998/01/19 06:14:46 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * --- 1,9 ---- /* ! * $Id: testM4.ec,v 1.2 1998/09/29 21:27:08 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * This file is written by Michael Kimelman * diff -rc gnusql-0.7b6.0/test/testT10.ec gnusql-0.7b6.1/test/testT10.ec *** gnusql-0.7b6.0/test/testT10.ec Mon Jan 19 01:14:47 1998 --- gnusql-0.7b6.1/test/testT10.ec Tue Sep 29 17:27:08 1998 *************** *** 1,9 **** /* ! * $Id: testT10.ec,v 1.1 1998/01/19 06:14:47 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testT10.ec,v 1.2 1998/09/29 21:27:08 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testT11.ec gnusql-0.7b6.1/test/testT11.ec *** gnusql-0.7b6.0/test/testT11.ec Mon Jan 19 01:14:47 1998 --- gnusql-0.7b6.1/test/testT11.ec Tue Sep 29 17:27:09 1998 *************** *** 1,9 **** /* ! * $Id: testT11.ec,v 1.1 1998/01/19 06:14:47 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testT11.ec,v 1.2 1998/09/29 21:27:09 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testT20.ec gnusql-0.7b6.1/test/testT20.ec *** gnusql-0.7b6.0/test/testT20.ec Mon Jan 19 01:14:47 1998 --- gnusql-0.7b6.1/test/testT20.ec Tue Sep 29 17:27:09 1998 *************** *** 1,9 **** /* ! * $Id: testT20.ec,v 1.1 1998/01/19 06:14:47 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testT20.ec,v 1.2 1998/09/29 21:27:09 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testT21.ec gnusql-0.7b6.1/test/testT21.ec *** gnusql-0.7b6.0/test/testT21.ec Mon Jan 19 01:14:47 1998 --- gnusql-0.7b6.1/test/testT21.ec Tue Sep 29 17:27:09 1998 *************** *** 1,9 **** /* ! * $Id: testT21.ec,v 1.1 1998/01/19 06:14:47 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testT21.ec,v 1.2 1998/09/29 21:27:09 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testT30.ec gnusql-0.7b6.1/test/testT30.ec *** gnusql-0.7b6.0/test/testT30.ec Mon Jan 19 01:14:47 1998 --- gnusql-0.7b6.1/test/testT30.ec Tue Sep 29 17:27:10 1998 *************** *** 1,9 **** /* ! * $Id: testT30.ec,v 1.1 1998/01/19 06:14:47 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testT30.ec,v 1.2 1998/09/29 21:27:10 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testT40.ec gnusql-0.7b6.1/test/testT40.ec *** gnusql-0.7b6.0/test/testT40.ec Mon Jan 19 01:14:47 1998 --- gnusql-0.7b6.1/test/testT40.ec Tue Sep 29 17:27:10 1998 *************** *** 1,9 **** /* ! * $Id: testT40.ec,v 1.1 1998/01/19 06:14:47 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testT40.ec,v 1.2 1998/09/29 21:27:10 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testTV20.ec gnusql-0.7b6.1/test/testTV20.ec *** gnusql-0.7b6.0/test/testTV20.ec Mon Jan 19 01:14:47 1998 --- gnusql-0.7b6.1/test/testTV20.ec Tue Sep 29 17:27:11 1998 *************** *** 1,9 **** /* ! * $Id: testTV20.ec,v 1.1 1998/01/19 06:14:47 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testTV20.ec,v 1.2 1998/09/29 21:27:11 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testZ20.ec gnusql-0.7b6.1/test/testZ20.ec *** gnusql-0.7b6.0/test/testZ20.ec Mon Jan 19 01:14:48 1998 --- gnusql-0.7b6.1/test/testZ20.ec Tue Sep 29 17:27:11 1998 *************** *** 1,9 **** /* ! * $Id: testZ20.ec,v 1.1 1998/01/19 06:14:48 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testZ20.ec,v 1.2 1998/09/29 21:27:11 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testZ30.ec gnusql-0.7b6.1/test/testZ30.ec *** gnusql-0.7b6.0/test/testZ30.ec Mon Jan 19 01:14:48 1998 --- gnusql-0.7b6.1/test/testZ30.ec Tue Sep 29 17:27:11 1998 *************** *** 1,9 **** /* ! * $Id: testZ30.ec,v 1.1 1998/01/19 06:14:48 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testZ30.ec,v 1.2 1998/09/29 21:27:11 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testZ31.ec gnusql-0.7b6.1/test/testZ31.ec *** gnusql-0.7b6.0/test/testZ31.ec Mon Jan 19 01:14:48 1998 --- gnusql-0.7b6.1/test/testZ31.ec Tue Sep 29 17:27:12 1998 *************** *** 1,9 **** /* ! * $Id: testZ31.ec,v 1.1 1998/01/19 06:14:48 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testZ31.ec,v 1.2 1998/09/29 21:27:12 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testZ40.ec gnusql-0.7b6.1/test/testZ40.ec *** gnusql-0.7b6.0/test/testZ40.ec Mon Jan 19 01:14:48 1998 --- gnusql-0.7b6.1/test/testZ40.ec Tue Sep 29 17:27:12 1998 *************** *** 1,9 **** /* ! * $Id: testZ40.ec,v 1.1 1998/01/19 06:14:48 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testZ40.ec,v 1.2 1998/09/29 21:27:12 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testd1.ec gnusql-0.7b6.1/test/testd1.ec *** gnusql-0.7b6.0/test/testd1.ec Mon Jun 1 11:13:09 1998 --- gnusql-0.7b6.1/test/testd1.ec Tue Sep 29 17:27:13 1998 *************** *** 3,9 **** * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, 1997, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman. * --- 3,9 ---- * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at the Institute of System Programming, Russia * This file is written by Michael Kimelman. * *************** *** 25,31 **** * */ ! /* $Id: testd1.ec,v 1.2 1998/06/01 15:13:09 kimelman Exp $ */ #include #include --- 25,31 ---- * */ ! /* $Id: testd1.ec,v 1.3 1998/09/29 21:27:13 kimelman Exp $ */ #include #include diff -rc gnusql-0.7b6.0/test/testd2.ec gnusql-0.7b6.1/test/testd2.ec *** gnusql-0.7b6.0/test/testd2.ec Mon Jan 19 01:14:48 1998 --- gnusql-0.7b6.1/test/testd2.ec Tue Sep 29 17:27:14 1998 *************** *** 1,9 **** /* ! * $Id: testd2.ec,v 1.1 1998/01/19 06:14:48 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testd2.ec,v 1.2 1998/09/29 21:27:14 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/testd4.ec gnusql-0.7b6.1/test/testd4.ec *** gnusql-0.7b6.0/test/testd4.ec Sat Aug 22 00:21:14 1998 --- gnusql-0.7b6.1/test/testd4.ec Tue Sep 29 17:27:14 1998 *************** *** 1,9 **** /* ! * $Id: testd4.ec,v 1.2 1998/08/22 04:21:14 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: testd4.ec,v 1.3 1998/09/29 21:27:14 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under diff -rc gnusql-0.7b6.0/test/tests.h gnusql-0.7b6.1/test/tests.h *** gnusql-0.7b6.0/test/tests.h Mon Jan 19 01:14:49 1998 --- gnusql-0.7b6.1/test/tests.h Tue Sep 29 17:27:15 1998 *************** *** 1,9 **** /* ! * $Id: tests.h,v 1.1 1998/01/19 06:14:49 kml Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under --- 1,9 ---- /* ! * $Id: tests.h,v 1.2 1998/09/29 21:27:15 kimelman Exp $ * * This file is a part of GNU SQL Server * ! * Copyright (c) 1996-1998, Free Software Foundation, Inc * Developed at Institute of System Programming of Russian Academy of Science * * This program is free software; you can redistribute it and/or modify it under