Menu
▾
▴
firebird-checkins — CVS checkins
You can subscribe to this list here.
| 2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(24) |
Oct
(37) |
Nov
(42) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2001 |
Jan
(24) |
Feb
(24) |
Mar
(15) |
Apr
(55) |
May
(99) |
Jun
(70) |
Jul
(197) |
Aug
(329) |
Sep
(81) |
Oct
(141) |
Nov
(100) |
Dec
(157) |
| 2002 |
Jan
(96) |
Feb
(216) |
Mar
(78) |
Apr
(103) |
May
(29) |
Jun
(193) |
Jul
(130) |
Aug
(215) |
Sep
(262) |
Oct
(655) |
Nov
(1009) |
Dec
(655) |
| 2003 |
Jan
(413) |
Feb
(939) |
Mar
(527) |
Apr
(538) |
May
(439) |
Jun
(295) |
Jul
(681) |
Aug
(810) |
Sep
(835) |
Oct
(730) |
Nov
(988) |
Dec
(787) |
| 2004 |
Jan
(559) |
Feb
(480) |
Mar
(749) |
Apr
(565) |
May
(748) |
Jun
(529) |
Jul
(454) |
Aug
(714) |
Sep
(628) |
Oct
(857) |
Nov
(1153) |
Dec
(617) |
| 2005 |
Jan
(603) |
Feb
(444) |
Mar
(377) |
Apr
(579) |
May
(664) |
Jun
(407) |
Jul
(363) |
Aug
(326) |
Sep
(527) |
Oct
(522) |
Nov
(387) |
Dec
(540) |
| 2006 |
Jan
(355) |
Feb
(242) |
Mar
(563) |
Apr
(768) |
May
(482) |
Jun
(427) |
Jul
(440) |
Aug
(314) |
Sep
(299) |
Oct
(403) |
Nov
(333) |
Dec
(389) |
| 2007 |
Jan
(247) |
Feb
(335) |
Mar
(391) |
Apr
(562) |
May
(345) |
Jun
(202) |
Jul
(239) |
Aug
(288) |
Sep
(510) |
Oct
(320) |
Nov
(487) |
Dec
(387) |
| 2008 |
Jan
(575) |
Feb
(539) |
Mar
(762) |
Apr
(648) |
May
(625) |
Jun
(522) |
Jul
(382) |
Aug
(191) |
Sep
(426) |
Oct
(231) |
Nov
(305) |
Dec
(670) |
| 2009 |
Jan
(582) |
Feb
(595) |
Mar
(294) |
Apr
(461) |
May
(445) |
Jun
(597) |
Jul
(408) |
Aug
(542) |
Sep
(476) |
Oct
(437) |
Nov
(587) |
Dec
(722) |
| 2010 |
Jan
(456) |
Feb
(319) |
Mar
(437) |
Apr
(303) |
May
(276) |
Jun
(233) |
Jul
(155) |
Aug
(208) |
Sep
(136) |
Oct
(274) |
Nov
(241) |
Dec
(106) |
| 2011 |
Jan
(160) |
Feb
(244) |
Mar
(138) |
Apr
(235) |
May
(208) |
Jun
(196) |
Jul
(107) |
Aug
(77) |
Sep
(109) |
Oct
(165) |
Nov
(86) |
Dec
(211) |
| 2012 |
Jan
(188) |
Feb
(136) |
Mar
(273) |
Apr
(185) |
May
(149) |
Jun
(146) |
Jul
(73) |
Aug
(127) |
Sep
(103) |
Oct
(87) |
Nov
(159) |
Dec
(149) |
| 2013 |
Jan
(74) |
Feb
(112) |
Mar
(176) |
Apr
(139) |
May
(116) |
Jun
(160) |
Jul
(161) |
Aug
(124) |
Sep
(124) |
Oct
(82) |
Nov
(137) |
Dec
(128) |
| 2014 |
Jan
(116) |
Feb
(121) |
Mar
(134) |
Apr
(177) |
May
(146) |
Jun
(158) |
Jul
(154) |
Aug
(79) |
Sep
(60) |
Oct
(90) |
Nov
(184) |
Dec
(201) |
| 2015 |
Jan
(163) |
Feb
(263) |
Mar
(406) |
Apr
(291) |
May
(213) |
Jun
(229) |
Jul
(229) |
Aug
(111) |
Sep
(120) |
Oct
(234) |
Nov
(155) |
Dec
(153) |
| 2016 |
Jan
(147) |
Feb
(188) |
Mar
(363) |
Apr
(304) |
May
(199) |
Jun
(218) |
Jul
(136) |
Aug
(128) |
Sep
(120) |
Oct
(123) |
Nov
(102) |
Dec
(156) |
| 2017 |
Jan
(123) |
Feb
(114) |
Mar
(132) |
Apr
(44) |
May
(143) |
Jun
(83) |
Jul
(98) |
Aug
(59) |
Sep
(58) |
Oct
(12) |
Nov
(14) |
Dec
(16) |
| 2018 |
Jan
(18) |
Feb
(24) |
Mar
(41) |
Apr
(16) |
May
(19) |
Jun
(31) |
Jul
(3) |
Aug
(33) |
Sep
(11) |
Oct
(11) |
Nov
|
Dec
|
| 2019 |
Jan
(21) |
Feb
(66) |
Mar
(72) |
Apr
(69) |
May
(63) |
Jun
(49) |
Jul
(55) |
Aug
(38) |
Sep
(66) |
Oct
(51) |
Nov
(66) |
Dec
(97) |
| 2020 |
Jan
(98) |
Feb
(95) |
Mar
(83) |
Apr
(121) |
May
(91) |
Jun
(137) |
Jul
(94) |
Aug
(91) |
Sep
(60) |
Oct
(81) |
Nov
(82) |
Dec
(64) |
| 2021 |
Jan
(66) |
Feb
(50) |
Mar
(52) |
Apr
(110) |
May
(160) |
Jun
(94) |
Jul
(97) |
Aug
(99) |
Sep
(160) |
Oct
(118) |
Nov
(117) |
Dec
(119) |
| 2022 |
Jan
(90) |
Feb
(93) |
Mar
(75) |
Apr
(70) |
May
(61) |
Jun
(153) |
Jul
(82) |
Aug
(118) |
Sep
(127) |
Oct
(121) |
Nov
(78) |
Dec
(84) |
| 2023 |
Jan
(80) |
Feb
(75) |
Mar
(92) |
Apr
(103) |
May
(89) |
Jun
(89) |
Jul
(106) |
Aug
(87) |
Sep
(183) |
Oct
(128) |
Nov
(173) |
Dec
(116) |
| 2024 |
Jan
(144) |
Feb
(120) |
Mar
(113) |
Apr
(107) |
May
(84) |
Jun
(95) |
Jul
(100) |
Aug
(135) |
Sep
(119) |
Oct
(93) |
Nov
(91) |
Dec
(93) |
| 2025 |
Jan
(104) |
Feb
(165) |
Mar
(120) |
Apr
(124) |
May
(90) |
Jun
(141) |
Jul
(224) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Neil M. <nm...@us...> - 2000-12-14 19:49:13
|
Update of /cvsroot/firebird/interbase/builds/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv1558 Modified Files: build_kit Log Message: Split export commands to work on Solaris. Index: build_kit =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/build_kit,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** build_kit 2000/09/30 12:03:56 1.3 --- build_kit 2000/12/14 19:49:10 1.4 *************** *** 29,34 **** if [ "$ISC_PASSWORD" = "" ] then ! export ISC_USER="sysdba" ! export ISC_PASSWORD="masterkey" fi --- 29,36 ---- if [ "$ISC_PASSWORD" = "" ] then ! ISC_USER="sysdba" ! export ISC_USER ! ISC_PASSWORD="masterkey" ! export ISC_PASSWORD fi |
|
From: Neil M. <nm...@us...> - 2000-12-14 19:29:46
|
Update of /cvsroot/firebird/interbase/builds/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv31865 Modified Files: prefix.solaris Log Message: Use default passwords for database access. Index: prefix.solaris =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/prefix.solaris,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** prefix.solaris 2000/08/03 20:42:47 1.1.1.1 --- prefix.solaris 2000/12/14 19:29:42 1.2 *************** *** 137,141 **** SERVER_LINK= $(GDSSHR_LINK) SETUP_ISC_LOCAL= ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD; ! SETUP_ISC_REMOTE= ISC_USER=builder; ISC_PASSWORD=builder; export ISC_USER ISC_PASSWORD; SPECIAL_OPT= source/special_opt SO_NETWORK_LIB= -lnsl --- 137,141 ---- SERVER_LINK= $(GDSSHR_LINK) SETUP_ISC_LOCAL= ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD; ! SETUP_ISC_REMOTE= ISC_USER=sysdba; ISC_PASSWORD=masterkey; export ISC_USER ISC_PASSWORD; SPECIAL_OPT= source/special_opt SO_NETWORK_LIB= -lnsl |
|
From: Neil M. <nm...@us...> - 2000-12-14 18:56:23
|
Update of /cvsroot/firebird/interbase/builds_win32/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv28017 Modified Files: build_no.ksh Log Message: Change script to work with Solaris sh - $() not supported. Fix Winxx platform strings to have text \0 at end not null value. Index: build_no.ksh =================================================================== RCS file: /cvsroot/firebird/interbase/builds_win32/original/build_no.ksh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** build_no.ksh 2000/12/08 16:59:31 1.3 --- build_no.ksh 2000/12/14 18:56:19 1.4 *************** *** 45,49 **** REV_NO=9 ! if ! [ -f this_build ] then echo $0:this_build not found --- 45,49 ---- REV_NO=9 ! if [ ! -f this_build ] then echo $0:this_build not found *************** *** 51,55 **** fi ! THISBUILD=$(cat this_build) PRODUCT_VER_STRING="${MAJOR_VER}"."${MINOR_VER}"."${REV_NO}"."${THISBUILD}" --- 51,55 ---- fi ! THISBUILD=`cat this_build` PRODUCT_VER_STRING="${MAJOR_VER}"."${MINOR_VER}"."${REV_NO}"."${THISBUILD}" *************** *** 60,65 **** echo '/*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/' >> jrd/build_no.h echo '/*FORMAL BUILD NUMBER:'${THISBUILD}'*/' >> jrd/build_no.h ! echo '#define PRODUCT_VER_STRING '\"${PRODUCT_VER_STRING}\\0\" >> jrd/build_no.h ! echo '#define FILE_VER_STRING '\"${FILE_VER_STRING}\\0\" >> jrd/build_no.h echo '#define LICENSE_VER_STRING '\"${FILE_VER_STRING}\" >> jrd/build_no.h echo '#define FILE_VER_NUMBER '${FILE_VER_NUMBER} >> jrd/build_no.h --- 60,65 ---- echo '/*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/' >> jrd/build_no.h echo '/*FORMAL BUILD NUMBER:'${THISBUILD}'*/' >> jrd/build_no.h ! echo '#define PRODUCT_VER_STRING '\"${PRODUCT_VER_STRING}\\\\0\" >> jrd/build_no.h ! echo '#define FILE_VER_STRING '\"${FILE_VER_STRING}\\\\0\" >> jrd/build_no.h echo '#define LICENSE_VER_STRING '\"${FILE_VER_STRING}\" >> jrd/build_no.h echo '#define FILE_VER_NUMBER '${FILE_VER_NUMBER} >> jrd/build_no.h |
|
From: Reed F. M. <rf...@us...> - 2000-12-09 04:45:34
|
Update of /cvsroot/firebird/interbase/builds_win32/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv583 Modified Files: make.jrd Log Message: Don't copy unused ibeng32.* to the output directory, to avoid confusion. Index: make.jrd =================================================================== RCS file: /cvsroot/firebird/interbase/builds_win32/original/make.jrd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** make.jrd 2000/08/03 20:42:53 1.1.1.1 --- make.jrd 2000/12/09 04:45:31 1.2 *************** *** 21,24 **** --- 21,27 ---- # Note that ibeng32.dll was previously called jrd32.dll, so things that # refer to jrd are refering to the engine. + # Note that ibeng32.dll is a no longer used, since the engine + # is statically linked to the server. If you decide to use ibeng32.dll + # for something, make sure you know what you are doing. # # GDS_FILES = list of JRD files to build the given library *************** *** 148,152 **** install_server: echo "Installing InterBase Server DLLs" ! $(CP) ..\jrd\$(.path.obj)\ibeng32.dll $(INSTALL_ROOT)\bin $(CP) ..\intl\$(.path.obj)\gdsintl.dll $(INSTALL_ROOT)\intl $(CP) ..\remote\$(.path.obj)\nt_server.exe $(INSTALL_ROOT)\bin\ibserver.exe --- 151,155 ---- install_server: echo "Installing InterBase Server DLLs" ! # $(CP) ..\jrd\$(.path.obj)\ibeng32.dll $(INSTALL_ROOT)\bin $(CP) ..\intl\$(.path.obj)\gdsintl.dll $(INSTALL_ROOT)\intl $(CP) ..\remote\$(.path.obj)\nt_server.exe $(INSTALL_ROOT)\bin\ibserver.exe *************** *** 157,161 **** !if "$(VERSION)"=="DEV" $(ECHO) INSTALLING PDB FILES ! $(CP) ..\jrd\$(.path.obj)\ibeng32.pdb $(INSTALL_ROOT)\bin $(CP) ..\intl\$(.path.obj)\gdsintl.pdb $(INSTALL_ROOT)\intl $(CP) ..\remote\$(.path.obj)\nt_server.pdb $(INSTALL_ROOT)\bin\ibserver.pdb --- 160,164 ---- !if "$(VERSION)"=="DEV" $(ECHO) INSTALLING PDB FILES ! # $(CP) ..\jrd\$(.path.obj)\ibeng32.pdb $(INSTALL_ROOT)\bin $(CP) ..\intl\$(.path.obj)\gdsintl.pdb $(INSTALL_ROOT)\intl $(CP) ..\remote\$(.path.obj)\nt_server.pdb $(INSTALL_ROOT)\bin\ibserver.pdb |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 17:00:06
|
Update of /cvsroot/firebird/interbase/builds/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase/builds/original Modified Files: prefix.linux Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: prefix.linux =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/prefix.linux,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -r1.6 -r1.7 *** prefix.linux 2000/12/01 11:20:31 1.6 --- prefix.linux 2000/12/08 16:59:31 1.7 *************** *** 16,20 **** # Contributor(s): ______________________________________. # Start of file prefix.linux: $(VERSION) $(PLATFORM) ! #$Log$ #Revision 1.6 2000/12/01 11:20:31 fsg #Added SHRLIB_EXT to prefix.linux --- 16,20 ---- # Contributor(s): ______________________________________. # Start of file prefix.linux: $(VERSION) $(PLATFORM) ! #$Id$ #Revision 1.6 2000/12/01 11:20:31 fsg #Added SHRLIB_EXT to prefix.linux |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 17:00:06
|
Update of /cvsroot/firebird/interbase In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase Modified Files: setup_dirs setup_dirs.ksh Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: setup_dirs =================================================================== RCS file: /cvsroot/firebird/interbase/setup_dirs,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** setup_dirs 2000/12/08 16:18:20 1.13 --- setup_dirs 2000/12/08 16:59:30 1.14 *************** *** 19,23 **** # ______________________________________. # ! # $Log$ # Revision 1.13 2000/12/08 16:18:20 fsg # Preliminary changes to get IB_BUILD_NO automatically --- 19,23 ---- # ______________________________________. # ! # $Id$ # Revision 1.13 2000/12/08 16:18:20 fsg # Preliminary changes to get IB_BUILD_NO automatically Index: setup_dirs.ksh =================================================================== RCS file: /cvsroot/firebird/interbase/setup_dirs.ksh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** setup_dirs.ksh 2000/12/08 16:18:20 1.3 --- setup_dirs.ksh 2000/12/08 16:59:30 1.4 *************** *** 16,20 **** # Contributor(s): # Reed Mideke <rf...@cr...> ! # $Log$ # Revision 1.3 2000/12/08 16:18:20 fsg # Preliminary changes to get IB_BUILD_NO automatically --- 16,20 ---- # Contributor(s): # Reed Mideke <rf...@cr...> ! # $Id$ # Revision 1.3 2000/12/08 16:18:20 fsg # Preliminary changes to get IB_BUILD_NO automatically |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 17:00:06
|
Update of /cvsroot/firebird/interbase/builds_win32/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase/builds_win32/original Modified Files: build_no.ksh Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: build_no.ksh =================================================================== RCS file: /cvsroot/firebird/interbase/builds_win32/original/build_no.ksh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** build_no.ksh 2000/12/08 16:18:21 1.2 --- build_no.ksh 2000/12/08 16:59:31 1.3 *************** *** 15,19 **** # All Rights Reserved. # Contributor(s): ______________________________________. ! # $Log$ # Revision 1.2 2000/12/08 16:18:21 fsg # Preliminary changes to get IB_BUILD_NO automatically --- 15,19 ---- # All Rights Reserved. # Contributor(s): ______________________________________. ! # $Id$ # Revision 1.2 2000/12/08 16:18:21 fsg # Preliminary changes to get IB_BUILD_NO automatically |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:59:41
|
Update of /cvsroot/firebird/interbase/isql In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase/isql Modified Files: extract.e isql.e isql.h show.e Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: extract.e =================================================================== RCS file: /cvsroot/firebird/interbase/isql/extract.e,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** extract.e 2000/11/22 17:07:25 1.3 --- extract.e 2000/12/08 16:59:33 1.4 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.3 2000/11/22 17:07:25 patrickgriffin * In get_procedure_args change comment style from // to /* --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.3 2000/11/22 17:07:25 patrickgriffin * In get_procedure_args change comment style from // to /* Index: isql.e =================================================================== RCS file: /cvsroot/firebird/interbase/isql/isql.e,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** isql.e 2000/11/18 16:49:24 1.5 --- isql.e 2000/12/08 16:59:33 1.6 *************** *** 22,26 **** */ /* ! $Log$ Revision 1.5 2000/11/18 16:49:24 fsg Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans --- 22,26 ---- */ /* ! $Id$ Revision 1.5 2000/11/18 16:49:24 fsg Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans Index: isql.h =================================================================== RCS file: /cvsroot/firebird/interbase/isql/isql.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** isql.h 2000/11/18 16:49:24 1.2 --- isql.h 2000/12/08 16:59:33 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/18 16:49:24 fsg * Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/18 16:49:24 fsg * Increased PRINT_BUFFER_LENGTH to 2048 to show larger plans Index: show.e =================================================================== RCS file: /cvsroot/firebird/interbase/isql/show.e,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** show.e 2000/11/19 07:02:49 1.2 --- show.e 2000/12/08 16:59:33 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/19 07:02:49 fsg * Change in show.e to use CHARACTER_LENGTH instead of FIELD_LENGTH in --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/19 07:02:49 fsg * Change in show.e to use CHARACTER_LENGTH instead of FIELD_LENGTH in |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:59:41
|
Update of /cvsroot/firebird/interbase/jrd In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase/jrd Modified Files: license.h Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: license.h =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/license.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** license.h 2000/12/08 16:18:21 1.5 --- license.h 2000/12/08 16:59:34 1.6 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.5 2000/12/08 16:18:21 fsg * Preliminary changes to get IB_BUILD_NO automatically --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.5 2000/12/08 16:18:21 fsg * Preliminary changes to get IB_BUILD_NO automatically |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:59:40
|
Update of /cvsroot/firebird/interbase/extlib In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase/extlib Modified Files: ib_udf.sql Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: ib_udf.sql =================================================================== RCS file: /cvsroot/firebird/interbase/extlib/ib_udf.sql,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** ib_udf.sql 2000/11/28 06:47:52 1.2 --- ib_udf.sql 2000/12/08 16:59:32 1.3 *************** *** 16,20 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/28 06:47:52 fsg * Changed declaration of ascii_char in ib_udf.sql --- 16,20 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/28 06:47:52 fsg * Changed declaration of ascii_char in ib_udf.sql |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:59:40
|
Update of /cvsroot/firebird/interbase/gpre In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase/gpre Modified Files: form.c form_trn.c gpre.c gpre.h gpreswi.h par.c sqe.c Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: form.c =================================================================== RCS file: /cvsroot/firebird/interbase/gpre/form.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** form.c 2000/11/27 09:26:13 1.2 --- form.c 2000/12/08 16:59:32 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/27 09:26:13 fsg * Fixed bugs in gpre to handle PYXIS forms --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/27 09:26:13 fsg * Fixed bugs in gpre to handle PYXIS forms Index: form_trn.c =================================================================== RCS file: /cvsroot/firebird/interbase/gpre/form_trn.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** form_trn.c 2000/11/29 11:11:56 1.3 --- form_trn.c 2000/12/08 16:59:32 1.4 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.3 2000/11/29 11:11:56 fsg * Added some more PYXIS datatypes to form_trn.c --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.3 2000/11/29 11:11:56 fsg * Added some more PYXIS datatypes to form_trn.c Index: gpre.c =================================================================== RCS file: /cvsroot/firebird/interbase/gpre/gpre.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** gpre.c 2000/11/16 15:54:29 1.2 --- gpre.c 2000/12/08 16:59:32 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/16 15:54:29 fsg * Added new switch -verbose to gpre that will dump --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/16 15:54:29 fsg * Added new switch -verbose to gpre that will dump Index: gpre.h =================================================================== RCS file: /cvsroot/firebird/interbase/gpre/gpre.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** gpre.h 2000/11/27 09:26:13 1.3 --- gpre.h 2000/12/08 16:59:32 1.4 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.3 2000/11/27 09:26:13 fsg * Fixed bugs in gpre to handle PYXIS forms --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.3 2000/11/27 09:26:13 fsg * Fixed bugs in gpre to handle PYXIS forms Index: gpreswi.h =================================================================== RCS file: /cvsroot/firebird/interbase/gpre/gpreswi.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** gpreswi.h 2000/11/16 15:54:29 1.2 --- gpreswi.h 2000/12/08 16:59:32 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/16 15:54:29 fsg * Added new switch -verbose to gpre that will dump --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/16 15:54:29 fsg * Added new switch -verbose to gpre that will dump Index: par.c =================================================================== RCS file: /cvsroot/firebird/interbase/gpre/par.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** par.c 2000/11/27 09:26:13 1.2 --- par.c 2000/12/08 16:59:32 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/27 09:26:13 fsg * Fixed bugs in gpre to handle PYXIS forms --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/27 09:26:13 fsg * Fixed bugs in gpre to handle PYXIS forms Index: sqe.c =================================================================== RCS file: /cvsroot/firebird/interbase/gpre/sqe.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** sqe.c 2000/11/16 15:54:29 1.3 --- sqe.c 2000/12/08 16:59:32 1.4 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.3 2000/11/16 15:54:29 fsg * Added new switch -verbose to gpre that will dump --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.3 2000/11/16 15:54:29 fsg * Added new switch -verbose to gpre that will dump |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:59:40
|
Update of /cvsroot/firebird/interbase/pyxis In directory slayer.i.sourceforge.net:/tmp/cvs-serv11344/interbase/pyxis Modified Files: debug.c edit.e fred.e Log Message: Changed all $Log: $ tags to $Id: $ BTW this will hopefully set this_build to 2 :-) Index: debug.c =================================================================== RCS file: /cvsroot/firebird/interbase/pyxis/debug.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** debug.c 2000/11/24 17:23:02 1.2 --- debug.c 2000/12/08 16:59:34 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/24 17:23:02 fsg * Another little fix in pyxis/debug.c that nobody --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/24 17:23:02 fsg * Another little fix in pyxis/debug.c that nobody Index: edit.e =================================================================== RCS file: /cvsroot/firebird/interbase/pyxis/edit.e,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** edit.e 2000/11/20 17:17:17 1.2 --- edit.e 2000/12/08 16:59:34 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/20 17:17:17 fsg * Changes to get edit.e through gpre 6.0 --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/20 17:17:17 fsg * Changes to get edit.e through gpre 6.0 Index: fred.e =================================================================== RCS file: /cvsroot/firebird/interbase/pyxis/fred.e,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** fred.e 2000/11/28 15:09:01 1.2 --- fred.e 2000/12/08 16:59:34 1.3 *************** *** 20,24 **** * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Log$ * Revision 1.2 2000/11/28 15:09:01 fsg * Changed fred.e to go through 6.0 gpre --- 20,24 ---- * All Rights Reserved. * Contributor(s): ______________________________________. ! * $Id$ * Revision 1.2 2000/11/28 15:09:01 fsg * Changed fred.e to go through 6.0 gpre |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:18:23
|
Update of /cvsroot/firebird/interbase/jrd In directory slayer.i.sourceforge.net:/tmp/cvs-serv7830/interbase/jrd Modified Files: build_no.h license.h Log Message: Preliminary changes to get IB_BUILD_NO automatically increased on commits. setup_dirs will create 'jrd/build_no.h' by a call to a slightly modified 'builds_win32/original/build_no.ksh' that gets IB_BUILD_NO from 'this_build', that hopefully will be increased automatically in the near future :-) I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE from 'jrd/build_no.h'. So all changes to version numbers, build types etc. can now be done in 'builds_win32/original/build_no.ksh'. Index: build_no.h =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/build_no.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** build_no.h 2000/08/03 20:49:37 1.1.1.1 --- build_no.h 2000/12/08 16:18:21 1.2 *************** *** 2,12 **** /*TO CHANGE ANY INFORMATION IN HERE PLEASE*/ /*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/ ! /*FORMAL BUILD NUMBER:627*/ ! #define PRODUCT_VER_STRING "6.0.0.627\0" ! #define FILE_VER_STRING "WI-V6.0.0.627\0" ! #define LICENSE_VER_STRING "WI-V6.0.0.627" ! #define FILE_VER_NUMBER 6, 0, 0, 627 #define IB_MAJOR_VER "6" #define IB_MINOR_VER "0" ! #define IB_REV_NO "0" ! #define IB_BUILD_NO "627" --- 2,13 ---- /*TO CHANGE ANY INFORMATION IN HERE PLEASE*/ /*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/ ! /*FORMAL BUILD NUMBER:1*/ ! #define PRODUCT_VER_STRING "6.0.9.1\0" ! #define FILE_VER_STRING "WI-T6.0.9.1\0" ! #define LICENSE_VER_STRING "WI-T6.0.9.1" ! #define FILE_VER_NUMBER 6, 0, 9, 1 #define IB_MAJOR_VER "6" #define IB_MINOR_VER "0" ! #define IB_REV_NO "9" ! #define IB_BUILD_NO "1" ! #define IB_BUILD_TYPE "T" Index: license.h =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/license.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** license.h 2000/10/12 02:52:17 1.4 --- license.h 2000/12/08 16:18:21 1.5 *************** *** 20,23 **** --- 20,38 ---- * All Rights Reserved. * Contributor(s): ______________________________________. + * $Log$ + * Revision 1.5 2000/12/08 16:18:21 fsg + * Preliminary changes to get IB_BUILD_NO automatically + * increased on commits. + * + * setup_dirs will create 'jrd/build_no.h' by a call to + * a slightly modified 'builds_win32/original/build_no.ksh' + * that gets IB_BUILD_NO from 'this_build', that hopefully + * will be increased automatically in the near future :-) + * + * I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE + * from 'jrd/build_no.h'. + * So all changes to version numbers, build types etc. can + * now be done in 'builds_win32/original/build_no.ksh'. + * */ *************** *** 30,47 **** #ifdef hp9000s300 #ifdef HP300 ! #define IB_PLATFORM "H3-V" #endif #ifdef HM300 ! #define IB_PLATFORM "HM-V" #endif #else #ifdef HP700 ! #define IB_PLATFORM "HP-V" #endif #ifdef HP800 ! #define IB_PLATFORM "HO-V" #endif #ifdef HP10 ! #define IB_PLATFORM "HU-V" #endif /* HP10 */ #endif --- 45,62 ---- #ifdef hp9000s300 #ifdef HP300 ! #define IB_PLATFORM "H3" #endif #ifdef HM300 ! #define IB_PLATFORM "HM" #endif #else #ifdef HP700 ! #define IB_PLATFORM "HP" #endif #ifdef HP800 ! #define IB_PLATFORM "HO" #endif #ifdef HP10 ! #define IB_PLATFORM "HU" #endif /* HP10 */ #endif *************** *** 49,60 **** #ifdef mpexl ! #define IB_PLATFORM "HX-V" /* HP MPE/XL */ #endif #ifdef apollo #if _ISP__A88K ! #define IB_PLATFORM "AP-V" #else ! #define IB_PLATFORM "AX-V" #endif #endif --- 64,75 ---- #ifdef mpexl ! #define IB_PLATFORM "HX" /* HP MPE/XL */ #endif #ifdef apollo #if _ISP__A88K ! #define IB_PLATFORM "AP" #else ! #define IB_PLATFORM "AX" #endif #endif *************** *** 63,79 **** #ifdef sparc #ifdef SOLARIS ! #define IB_PLATFORM "SO-V" #else ! #define IB_PLATFORM "S4-V" #endif #endif #ifdef i386 ! #define IB_PLATFORM "SI-V" #endif #ifdef SUN3_3 ! #define IB_PLATFORM "SU-V" #endif #ifndef IB_PLATFORM ! #define IB_PLATFORM "S3-V" #endif #endif --- 78,94 ---- #ifdef sparc #ifdef SOLARIS ! #define IB_PLATFORM "SO" #else ! #define IB_PLATFORM "S4" #endif #endif #ifdef i386 ! #define IB_PLATFORM "SI" #endif #ifdef SUN3_3 ! #define IB_PLATFORM "SU" #endif #ifndef IB_PLATFORM ! #define IB_PLATFORM "S3" #endif #endif *************** *** 81,87 **** #ifdef ultrix #ifdef mips ! #define IB_PLATFORM "MU-V" #else ! #define IB_PLATFORM "UL-V" #endif #endif --- 96,102 ---- #ifdef ultrix #ifdef mips ! #define IB_PLATFORM "MU" #else ! #define IB_PLATFORM "UL" #endif #endif *************** *** 89,108 **** #ifdef VMS #ifdef __ALPHA ! #define IB_PLATFORM "AV-V" #else ! #define IB_PLATFORM "VM-V" #endif #endif #ifdef MAC ! #define IB_PLATFORM "MA-V" #endif #ifdef PC_PLATFORM #ifdef WINDOWS_ONLY ! #define IB_PLATFORM "WS-V" #else #ifdef DOS_ONLY ! #define IB_PLATFORM "DS-V" #endif #endif --- 104,123 ---- #ifdef VMS #ifdef __ALPHA ! #define IB_PLATFORM "AV" #else ! #define IB_PLATFORM "VM" #endif #endif #ifdef MAC ! #define IB_PLATFORM "MA" #endif #ifdef PC_PLATFORM #ifdef WINDOWS_ONLY ! #define IB_PLATFORM "WS" #else #ifdef DOS_ONLY ! #define IB_PLATFORM "DS" #endif #endif *************** *** 112,155 **** #ifdef NETWARE_386 ! #define IB_PLATFORM "NW-V" #endif #ifdef OS2_ONLY ! #define IB_PLATFORM "O2-V" #endif #ifdef AIX ! #define IB_PLATFORM "IA-V" #endif #ifdef AIX_PPC ! #define IB_PLATFORM "PA-V" #endif #ifdef IMP ! #define IB_PLATFORM "IM-V" #endif #ifdef DELTA ! #define IB_PLATFORM "DL-V" #endif #ifdef XENIX #ifdef SCO_UNIX ! #define IB_PLATFORM "SI-V" /* 5.5 SCO Port */ #else ! #define IB_PLATFORM "XN-V" #endif #endif #ifdef sgi ! #define IB_PLATFORM "SG-V" #endif #ifdef DGUX #ifdef DG_X86 ! #define IB_PLATFORM "DI-V" /* DG INTEL */ #else ! #define IB_PLATFORM "DA-V" /* DG AViiON */ #define M88K_DEFINED #endif /* DG_X86 */ --- 127,170 ---- #ifdef NETWARE_386 ! #define IB_PLATFORM "NW" #endif #ifdef OS2_ONLY ! #define IB_PLATFORM "O2" #endif #ifdef AIX ! #define IB_PLATFORM "IA" #endif #ifdef AIX_PPC ! #define IB_PLATFORM "PA" #endif #ifdef IMP ! #define IB_PLATFORM "IM" #endif #ifdef DELTA ! #define IB_PLATFORM "DL" #endif #ifdef XENIX #ifdef SCO_UNIX ! #define IB_PLATFORM "SI" /* 5.5 SCO Port */ #else ! #define IB_PLATFORM "XN" #endif #endif #ifdef sgi ! #define IB_PLATFORM "SG" #endif #ifdef DGUX #ifdef DG_X86 ! #define IB_PLATFORM "DI" /* DG INTEL */ #else ! #define IB_PLATFORM "DA" /* DG AViiON */ #define M88K_DEFINED #endif /* DG_X86 */ *************** *** 160,178 **** #if (defined SUPERCLIENT || defined SUPERSERVER) #if (defined WIN95) ! #define IB_PLATFORM "WI-V" #else ! #define IB_PLATFORM "NIS-V" #endif /* WIN95 */ #else ! #define IB_PLATFORM "NI-V" #endif #else #ifdef alpha ! #define IB_PLATFORM "NA-V" #else #ifdef mips ! #define IB_PLATFORM "NM-V" #else /* PowerPC */ ! #define IB_PLATFORM "NP-V" #endif #endif --- 175,193 ---- #if (defined SUPERCLIENT || defined SUPERSERVER) #if (defined WIN95) ! #define IB_PLATFORM "WI" #else ! #define IB_PLATFORM "NIS" #endif /* WIN95 */ #else ! #define IB_PLATFORM "NI" #endif #else #ifdef alpha ! #define IB_PLATFORM "NA" #else #ifdef mips ! #define IB_PLATFORM "NM" #else /* PowerPC */ ! #define IB_PLATFORM "NP" #endif #endif *************** *** 182,233 **** #ifdef NeXT #ifdef i386 ! #define IB_PLATFORM "XI-V" #else /* m68040 */ ! #define IB_PLATFORM "XM-V" #endif #endif #ifdef EPSON ! #define IB_PLATFORM "EP-V" /* epson */ #endif #ifdef _CRAY ! #define IB_PLATFORM "CR-V" /* Cray */ #endif #ifdef ALPHA_NT ! #define IB_PLATFORM "AN-V" /* Alpha NT */ #endif #ifdef DECOSF ! #define IB_PLATFORM "AO-V" /* Alpha OSF-1 */ #endif #ifdef M88K ! #define IB_PLATFORM "M8-V" /* Motorola 88k */ #endif #ifdef UNIXWARE ! #define IB_PLATFORM "UW-V" /* Unixware */ #endif #ifdef NCR3000 ! #define IB_PLATFORM "NC-V" /* NCR3000 */ #endif #ifdef LINUX ! #define IB_PLATFORM "LI-T" /* Linux on Intel */ #endif #ifdef FREEBSD ! #define IB_PLATFORM "FB-B" /* FreeBSD/i386 */ #endif #ifdef NETBSD ! #define IB_PLATFORM "NB-B" /* NetBSD */ #endif #ifndef GDS_VERSION ! #define GDS_VERSION IB_PLATFORM IB_MAJOR_VER "." IB_MINOR_VER "." IB_REV_NO "." IB_BUILD_NO #endif --- 197,248 ---- #ifdef NeXT #ifdef i386 ! #define IB_PLATFORM "XI" #else /* m68040 */ ! #define IB_PLATFORM "XM" #endif #endif #ifdef EPSON ! #define IB_PLATFORM "EP" /* epson */ #endif #ifdef _CRAY ! #define IB_PLATFORM "CR" /* Cray */ #endif #ifdef ALPHA_NT ! #define IB_PLATFORM "AN" /* Alpha NT */ #endif #ifdef DECOSF ! #define IB_PLATFORM "AO" /* Alpha OSF-1 */ #endif #ifdef M88K ! #define IB_PLATFORM "M8" /* Motorola 88k */ #endif #ifdef UNIXWARE ! #define IB_PLATFORM "UW" /* Unixware */ #endif #ifdef NCR3000 ! #define IB_PLATFORM "NC" /* NCR3000 */ #endif #ifdef LINUX ! #define IB_PLATFORM "LI" /* Linux on Intel */ #endif #ifdef FREEBSD ! #define IB_PLATFORM "FB" /* FreeBSD/i386 */ #endif #ifdef NETBSD ! #define IB_PLATFORM "NB" /* NetBSD */ #endif #ifndef GDS_VERSION ! #define GDS_VERSION IB_PLATFORM "-" IB_BUILD_TYPE IB_MAJOR_VER "." IB_MINOR_VER "." IB_REV_NO "." IB_BUILD_NO #endif |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:18:23
|
Update of /cvsroot/firebird/interbase/builds_win32/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv7830/interbase/builds_win32/original Modified Files: build_no.ksh Log Message: Preliminary changes to get IB_BUILD_NO automatically increased on commits. setup_dirs will create 'jrd/build_no.h' by a call to a slightly modified 'builds_win32/original/build_no.ksh' that gets IB_BUILD_NO from 'this_build', that hopefully will be increased automatically in the near future :-) I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE from 'jrd/build_no.h'. So all changes to version numbers, build types etc. can now be done in 'builds_win32/original/build_no.ksh'. Index: build_no.ksh =================================================================== RCS file: /cvsroot/firebird/interbase/builds_win32/original/build_no.ksh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** build_no.ksh 2000/08/03 20:42:52 1.1.1.1 --- build_no.ksh 2000/12/08 16:18:21 1.2 *************** *** 15,36 **** # All Rights Reserved. # Contributor(s): ______________________________________. ! # This script should only be run for 'formal' builds. Other builds should use ! # the build_no.h in win_nt/original. (refresh will copy it to JRD) # the variable BUILD_TYPE can be used for more complex manipulations of the # the version resource flags, depending on if it is I B or V ! BUILD_TYPE=V MAJOR_VER=6 MINOR_VER=0 ! REV_NO=0 ! if ! [ -f last_build ] then ! echo $0:last_build not found exit 1 fi ! LASTBUILD=$(cat last_build) ! THISBUILD=$(expr ${LASTBUILD} + 1) PRODUCT_VER_STRING="${MAJOR_VER}"."${MINOR_VER}"."${REV_NO}"."${THISBUILD}" FILE_VER_STRING='WI-'"${BUILD_TYPE}${MAJOR_VER}"."${MINOR_VER}"."${REV_NO}"."${THISBUILD}" --- 15,56 ---- # All Rights Reserved. # Contributor(s): ______________________________________. ! # $Log$ ! # Revision 1.2 2000/12/08 16:18:21 fsg ! # Preliminary changes to get IB_BUILD_NO automatically ! # increased on commits. ! # ! # setup_dirs will create 'jrd/build_no.h' by a call to ! # a slightly modified 'builds_win32/original/build_no.ksh' ! # that gets IB_BUILD_NO from 'this_build', that hopefully ! # will be increased automatically in the near future :-) ! # ! # I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE ! # from 'jrd/build_no.h'. ! # So all changes to version numbers, build types etc. can ! # now be done in 'builds_win32/original/build_no.ksh'. ! # ! # ! # ! # ! # This script should only be run for 'formal' builds. ! # It will be run when setupdirs is executed and create ! # jrd/build_no.h with the formal build number received from cvs. ! # Other builds should use the build_no.h in win_nt/original. (refresh will copy it to JRD) # the variable BUILD_TYPE can be used for more complex manipulations of the # the version resource flags, depending on if it is I B or V ! BUILD_TYPE=T MAJOR_VER=6 MINOR_VER=0 ! REV_NO=9 ! if ! [ -f this_build ] then ! echo $0:this_build not found exit 1 fi ! THISBUILD=$(cat this_build) ! PRODUCT_VER_STRING="${MAJOR_VER}"."${MINOR_VER}"."${REV_NO}"."${THISBUILD}" FILE_VER_STRING='WI-'"${BUILD_TYPE}${MAJOR_VER}"."${MINOR_VER}"."${REV_NO}"."${THISBUILD}" *************** *** 40,45 **** echo '/*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/' >> jrd/build_no.h echo '/*FORMAL BUILD NUMBER:'${THISBUILD}'*/' >> jrd/build_no.h ! echo '#define PRODUCT_VER_STRING '\"${PRODUCT_VER_STRING}\\\\0\" >> jrd/build_no.h ! echo '#define FILE_VER_STRING '\"${FILE_VER_STRING}\\\\0\" >> jrd/build_no.h echo '#define LICENSE_VER_STRING '\"${FILE_VER_STRING}\" >> jrd/build_no.h echo '#define FILE_VER_NUMBER '${FILE_VER_NUMBER} >> jrd/build_no.h --- 60,65 ---- echo '/*EDIT BUILD_NO.KSH IN THE BUILD_WIN32 COMPONENT*/' >> jrd/build_no.h echo '/*FORMAL BUILD NUMBER:'${THISBUILD}'*/' >> jrd/build_no.h ! echo '#define PRODUCT_VER_STRING '\"${PRODUCT_VER_STRING}\\0\" >> jrd/build_no.h ! echo '#define FILE_VER_STRING '\"${FILE_VER_STRING}\\0\" >> jrd/build_no.h echo '#define LICENSE_VER_STRING '\"${FILE_VER_STRING}\" >> jrd/build_no.h echo '#define FILE_VER_NUMBER '${FILE_VER_NUMBER} >> jrd/build_no.h *************** *** 48,50 **** echo '#define IB_REV_NO '\"${REV_NO}\" >> jrd/build_no.h echo '#define IB_BUILD_NO '\"${THISBUILD}\" >> jrd/build_no.h ! echo ${THISBUILD} > last_build --- 68,70 ---- echo '#define IB_REV_NO '\"${REV_NO}\" >> jrd/build_no.h echo '#define IB_BUILD_NO '\"${THISBUILD}\" >> jrd/build_no.h ! echo '#define IB_BUILD_TYPE '\"${BUILD_TYPE}\" >> jrd/build_no.h |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 16:18:23
|
Update of /cvsroot/firebird/interbase In directory slayer.i.sourceforge.net:/tmp/cvs-serv7830/interbase Modified Files: ChangeLog setup_dirs setup_dirs.ksh Added Files: this_build Log Message: Preliminary changes to get IB_BUILD_NO automatically increased on commits. setup_dirs will create 'jrd/build_no.h' by a call to a slightly modified 'builds_win32/original/build_no.ksh' that gets IB_BUILD_NO from 'this_build', that hopefully will be increased automatically in the near future :-) I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE from 'jrd/build_no.h'. So all changes to version numbers, build types etc. can now be done in 'builds_win32/original/build_no.ksh'. --- NEW FILE --- 1 Index: ChangeLog =================================================================== RCS file: /cvsroot/firebird/interbase/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** ChangeLog 2000/11/30 16:31:51 1.8 --- ChangeLog 2000/12/08 16:18:20 1.9 *************** *** 1,2 **** --- 1,17 ---- + 2000-12-04 03:30 patrickgriffin + + * interbase/firebird/patrickgriffin/tcs_tests/: bug_112177_01, + bug_112177_02, bug_112177_03, bug_112177_04, bug_112177_05, + bug_112177_06, bug_112177_07, bug_112177_08, bug_112177_09, + bug_112177_10, bug_112177_11, bug_112177_12, bug_116579_01, readme: + + moving files from tree to ftp area. + + 2000-12-01 12:20 fsg + + * interbase/builds/original/prefix.linux: + + Added SHRLIB_EXT to prefix.linux + 2000-11-30 15:27 patrickgriffin *************** *** 38,42 **** 2000-11-28 16:09 fsg ! * interbase/: pyxis/fred.e, ChangeLog: Changed fred.e to go through 6.0 gpre --- 53,57 ---- 2000-11-28 16:09 fsg ! * interbase/pyxis/fred.e: Changed fred.e to go through 6.0 gpre *************** *** 49,58 **** result as proposed by Claudio Valderrama - 2000-11-27 12:38 fsg - - * interbase/ChangeLog: - - Updated ChangeLog - 2000-11-27 10:26 fsg --- 64,67 ---- *************** *** 67,76 **** removed some compiler warnings too - 2000-11-24 18:33 fsg - - * interbase/ChangeLog: - - Updated ChangeLog - 2000-11-24 18:23 fsg --- 76,79 ---- *************** *** 80,94 **** :-) Will print correct names for this forms stuff now. - 2000-11-22 18:24 patrickgriffin - - * interbase/ChangeLog: - - Correct the name of the modified file in change log. - - ...pat - 2000-11-22 18:07 patrickgriffin ! * interbase/: ChangeLog, isql/extract.e: In get_procedure_args change comment style from // to /* --- 83,89 ---- :-) Will print correct names for this forms stuff now. 2000-11-22 18:07 patrickgriffin ! * interbase/isql/extract.e: In get_procedure_args change comment style from // to /* *************** *** 104,113 **** ever will need this. But who cares :-) - 2000-11-19 08:43 fsg - - * interbase/ChangeLog: - - Updated ChangeLog - 2000-11-19 08:02 fsg --- 99,102 ---- *************** *** 124,133 **** Bug #122563 in extract.e get_procedure_args Apparently this has to be done in show.e also, but that is for another day :-) - - 2000-11-18 15:14 fsg - - * interbase/ChangeLog: - - added ChangeLog 2000-11-18 07:50 fsg --- 113,116 ---- Index: setup_dirs =================================================================== RCS file: /cvsroot/firebird/interbase/setup_dirs,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** setup_dirs 2000/10/14 15:40:30 1.12 --- setup_dirs 2000/12/08 16:18:20 1.13 *************** *** 19,24 **** # ______________________________________. # ! # $Id$ # # Shell script to set up the InterBase directory structure # And now the super server directory structure --- 19,38 ---- # ______________________________________. # ! # $Log$ ! # Revision 1.13 2000/12/08 16:18:20 fsg ! # Preliminary changes to get IB_BUILD_NO automatically ! # increased on commits. ! # ! # setup_dirs will create 'jrd/build_no.h' by a call to ! # a slightly modified 'builds_win32/original/build_no.ksh' ! # that gets IB_BUILD_NO from 'this_build', that hopefully ! # will be increased automatically in the near future :-) ! # ! # I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE ! # from 'jrd/build_no.h'. ! # So all changes to version numbers, build types etc. can ! # now be done in 'builds_win32/original/build_no.ksh'. # + # # Shell script to set up the InterBase directory structure # And now the super server directory structure *************** *** 234,237 **** --- 248,254 ---- fi # + + echo "Creating jrd/build_no.h" + sh builds_win32/original/build_no.ksh echo "- Setting up the superserver directory structure" echo "" *************** *** 278,282 **** echo " The installation target directory:" echo " `pwd`/interbase" ! echo " Already exits press return to delete this directory or ^C to abort." echo "*** Warning *** " echo "" --- 295,299 ---- echo " The installation target directory:" echo " `pwd`/interbase" ! echo " already exists, press return to delete this directory or ^C to abort." echo "*** Warning *** " echo "" Index: setup_dirs.ksh =================================================================== RCS file: /cvsroot/firebird/interbase/setup_dirs.ksh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** setup_dirs.ksh 2000/08/21 21:04:42 1.2 --- setup_dirs.ksh 2000/12/08 16:18:20 1.3 *************** *** 16,19 **** --- 16,34 ---- # Contributor(s): # Reed Mideke <rf...@cr...> + # $Log$ + # Revision 1.3 2000/12/08 16:18:20 fsg + # Preliminary changes to get IB_BUILD_NO automatically + # increased on commits. + # + # setup_dirs will create 'jrd/build_no.h' by a call to + # a slightly modified 'builds_win32/original/build_no.ksh' + # that gets IB_BUILD_NO from 'this_build', that hopefully + # will be increased automatically in the near future :-) + # + # I have changed 'jrd/iblicense.h' to use IB_BUILD_TYPE + # from 'jrd/build_no.h'. + # So all changes to version numbers, build types etc. can + # now be done in 'builds_win32/original/build_no.ksh'. + # # ______________________________________. *************** *** 64,67 **** --- 79,85 ---- mkdir interbase/examples/v5 mkdir interbase/help + + echo "Creating jrd/build_no.h" + ./builds_win32/original/build_no.ksh ./setup_build.ksh $1 |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 08:16:08
|
Update of /cvsroot/firebird/TCS In directory slayer.i.sourceforge.net:/tmp/cvs-serv14318/TCS Modified Files: dummy Log Message: test for auto increment Index: dummy =================================================================== RCS file: /cvsroot/firebird/TCS/dummy,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** dummy 2000/12/08 08:12:36 1.1 --- dummy 2000/12/08 08:16:03 1.2 *************** *** 1,3 **** --- 1,6 ---- /* $Log$ + /* Revision 1.2 2000/12/08 08:16:03 fsg + /* test for auto increment + /* /* Revision 1.1 2000/12/08 08:12:36 fsg /* Added test for auto increment build number on commit *************** *** 14,15 **** --- 17,19 ---- Frank + this_build should be 2 now \ No newline at end of file |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-08 08:12:39
|
Update of /cvsroot/firebird/TCS In directory slayer.i.sourceforge.net:/tmp/cvs-serv14062/TCS Added Files: dummy Log Message: Added test for auto increment build number on commit ***** Error reading new file: (2, 'No such file or directory') |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-07 14:49:45
|
Update of /cvsroot/firebird/TCS In directory slayer.i.sourceforge.net:/tmp/cvs-serv5163/TCS Added Files: this_build Log Message: Added script to increment build number on commit --- NEW FILE --- 1 |
|
From: Pavel C. <pc...@us...> - 2000-12-04 09:54:41
|
Update of /cvsroot/firebird/ibconsole In directory slayer.i.sourceforge.net:/tmp/cvs-serv361 Added Files: IBConsole.mps MemoLists.pas zluPersistent.pas Log Message: Update to version 324 --- NEW FILE --- [Hooked Modules] IBConsole.exe=T [Non-Hooked Modules] LZ32.DLL=T BlstApp.DLL=T LgMousHk.dll=T RICHED20.dll=T RICHED32.DLL=T Tracker.dll=T OLEACC.dll=T --- NEW FILE --- { * The contents of this file are subject to the InterBase Public License * Version 1.0 (the "License"); you may not use this file except in * compliance with the License. * * You may obtain a copy of the License at http://www.Inprise.com/IPL.html. * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. The Original Code was created by Inprise * Corporation and its predecessors. * * Portions created by Inprise Corporation are Copyright (C) Inprise * Corporation. All Rights Reserved. * * Contributor(s): Krzysztof Golko, Jeff Overcash. } unit MemoLists; interface uses Classes, Contnrs; type TMemoList = class private FCurrent: integer; // A flag indicating that pointer is "just past" current position // if set to true GetPrev clears the flag and doesn't move back and // GetNext moves forward and clears the flag FJustPast: boolean; FMemos: TObjectList; function GetItem(Index: Integer): TStrings; function GetCount: Integer; public constructor Create; destructor Destroy; override; function GetCurrent: TStrings; function GetNext: TStrings; function GetPrev: TStrings; function BOC: boolean; // at the beginning function EOC: boolean; // at the end procedure Clear; procedure Add(const Memo: TStrings); // sets the FJustPast flag procedure MovePast; property Items[Index: Integer]: TStrings read GetItem; default; property Current : Integer read FCurrent write FCurrent; // kris new property property JustPast: boolean read FJustPast; property Count : Integer read GetCount; end; implementation { TMemoList } constructor TMemoList.Create; begin FCurrent := -1; FMemos := TObjectList.Create; end; destructor TMemoList.Destroy; begin FMemos.Clear; FMemos.Free; inherited; end; procedure TMemoList.Clear; begin FCurrent := -1; FJustPast := FALSE; FMemos.Clear; end; procedure TMemoList.Add(const Memo: TStrings); var t : TStringList; begin t := TStringList.Create; t.AddStrings(Memo); FMemos.Add(t); // Kris new line of code FJustPast := FALSE; FCurrent := FMemos.Count - 1; // Index is zero based so FCurrent is looking one before count end; procedure TMemoList.MovePast; begin if FMemos.Count > 0 then FJustPast := TRUE; end; function TMemoList.GetCurrent: TStrings; begin if (FCurrent >= 0) and (FCurrent < FMemos.Count) then Result := TStrings(FMemos[FCurrent]) else Result := nil; end; function TMemoList.GetNext: TStrings; begin if FCurrent < FMemos.Count - 1 then begin Inc(FCurrent); Result := TStrings(FMemos[FCurrent]); FJustPast := FALSE; end else begin Result := nil; // kris new two lines of code if Fmemos.Count > 0 then FJustPast := TRUE; end; end; function TMemoList.GetPrev: TStrings; begin if FCurrent > 0 then begin if FJustPast then FJustPast := FALSE else Dec(FCurrent); Result := TStrings(FMemos[FCurrent]); end else begin // kris new line of code FJustPast := FALSE; if FCurrent = 0 then Result := TStrings(FMemos[FCurrent]) else Result := nil; end; end; function TMemoList.BOC: boolean; begin // kris slight change Result := (FCurrent < 0) // list empty or ((FCurrent = 0) and not FJustPast); // or at first end; function TMemoList.EOC: boolean; begin Result := FCurrent = (FMemos.Count - 1); end; function TMemoList.GetItem(Index: Integer): TStrings; begin If Index > FMemos.Count then Index := FMemos.Count else if Index < 0 then Index := 0; Result := TStrings(FMemos[Index]); end; function TMemoList.GetCount: Integer; begin Result := FMemos.Count; end; end. --- NEW FILE --- { * The contents of this file are subject to the InterBase Public License * Version 1.0 (the "License"); you may not use this file except in * compliance with the License. * * You may obtain a copy of the License at http://www.Inprise.com/IPL.html. * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See * the License for the specific language governing rights and limitations * under the License. The Original Code was created by Inprise * Corporation and its predecessors. * * Portions created by Inprise Corporation are Copyright (C) Inprise * Corporation. All Rights Reserved. * * Contributor(s): Krzysztof Golko. } unit zluPersistent; { This unit is going to be used to group together access to registry and alternatively to XML file. It shall step by step incorporate more and more like Aliases, AppSessings etc until all references to registry are done through this class, then visibility of Registry shall change to private. } interface uses Windows, SysUtils, Classes, Registry, Forms, IBServices, zluGlobal; type { Most of the procedures might raise an exception, eg when there's no a key in the registry these situation are considered abnormal } EPersistent = class(Exception); // temporary this type is defined here TibcServerProps = record ServerName: string; UserName: string; Description: string; Protocol: TProtocol; LastAccessed: TDateTime; end; TibcDatabaseProps = record DatabaseFiles: string; UserName: string; Role: string; CaseSensitiveRole: boolean; CharacterSet: string; end; TPersistentSetting = record Name: string; Value: Variant; end; TibcPersistentInfo = class private gRegSettingsKey: string; FRegistry: TRegistry; procedure GetSetting(var Setting: TPersistentSetting); procedure StoreSetting(Setting: TPersistentSetting); public constructor Create; destructor Destroy; override; procedure InitRegistry; procedure GetFormSettings(AForm: TForm; Id: string); procedure StoreFormSettings(AForm: TForm; Id: string); // preferences procedure GetSettings(var Settings: TAppSettings); procedure StoreSettings(Settings: TAppSettings); // server aliases function ServerAliasExists(Alias: string): boolean; procedure DeleteServerAlias(Alias: string); procedure RenameServerAlias(SrcAlias, DestAlias: string); procedure GetServerAliases(Aliases: TStrings); procedure GetServerProps(Alias: string; var ServerProps: TibcServerProps); procedure StoreServerProps(Alias: string; ServerProps: TibcServerProps); // database aliases function DatabaseAliasExists(ServerName, AliasName: string): boolean; procedure GetDatabaseProps(ServerAlias, DatabaseAlias: string; var DatabaseProps: TibcDatabaseProps); procedure StoreDatabaseProps(ServerAlias, DatabaseAlias: string; var DatabaseProps: TibcDatabaseProps); // external Apps/Tools procedure GetExternalApps(ExternalApps: TStrings); procedure StoreExternalApp(Title, Path, WordDir, Params: string; Update: boolean); procedure DeleteExternalApp(Title: string); property Registry: TRegistry read Fregistry; end; var PersistentInfo: TibcPersistentInfo; implementation type TWinSettings = record _Top, _Left, _Height, _Width: integer; _State: TWindowState; _Read: boolean; end; var gRegSettingsKey: string; // gRegServersKey: string; { TibcPersistentInfo } constructor TibcPersistentInfo.Create; begin FRegistry := TRegistry.Create; InitRegistry; end; destructor TibcPersistentInfo.Destroy; begin FRegistry.Free; end; procedure TibcPersistentInfo.GetSetting(var Setting: TPersistentSetting); begin case (VarType(Setting.Value) and varTypeMask) of varSmallint: Setting.Value := FRegistry.ReadInteger(Setting.Name); varInteger: Setting.Value := FRegistry.ReadInteger(Setting.Name); varBoolean: Setting.Value := FRegistry.ReadBool(Setting.Name); varString: Setting.Value := FRegistry.ReadString(Setting.Name); end; end; procedure TibcPersistentInfo.StoreSetting(Setting: TPersistentSetting); begin case (VarType(Setting.Value) and varTypeMask) of varSmallint: FRegistry.WriteInteger(Setting.Name, Setting.Value); varInteger: FRegistry.WriteInteger(Setting.Name, Setting.Value); varBoolean: FRegistry.WriteBool(Setting.Name, Setting.Value); varString: FRegistry.WriteString(Setting.Name, Setting.Value); end; end; procedure TibcPersistentInfo.InitRegistry; var i: integer; begin with FRegistry do begin // This is of cource highly redundant, to be fixed later RootKey := HKEY_CURRENT_USER; OpenKey('Software',true); OpenKey('Borland',true); OpenKey('InterBase',true); OpenKey('IBConsole',true); CreateKey('Servers'); gRegServersKey := Format('\%s\Servers\',[CurrentPath]); CreateKey('Settings'); gRegSettingsKey := Format('\%s\Settings',[CurrentPath]); gRegToolsKey := Format('%s\Tools',[gRegSettingsKey]); end; with FRegistry do begin OpenKey(gRegSettingsKey,false); for i := 0 to NUM_SETTINGS - 1 do begin if not ValueExists(gAppSettings[i].Name) then begin StoreSetting(TPersistentSetting(gAppSettings[i])); { case (VarType(gAppSettings[i].Setting) and varTypeMask) of varSmallint: WriteInteger (gAppSettings[i].Name, gAppSettings[i].Setting); varInteger: WriteInteger (gAppSettings[i].Name, gAppSettings[i].Setting); varBoolean: WriteBool (gAppSettings[i].Name, gAppSettings[i].Setting); varString: WriteString (gAppSettings[i].Name, gAppSettings[i].Setting); end; } end; end; CloseKey; end; end; procedure TibcPersistentInfo.GetFormSettings(AForm: TForm; Id: string); var wSettings: TWinSettings; begin if FRegistry.OpenKey(gRegSettingsKey, TRUE) then begin if FRegistry.ReadBinaryData(Id, wSettings, SizeOf(TWinSettings)) >= SizeOf(TWinSettings) then begin AForm.Top := wSettings._Top; AForm.Left := wSettings._Left; AForm.Height := wSettings._Height; AForm.Width := wSettings._Width; AForm.WindowState := wSettings._State; end; FRegistry.CloseKey; end; end; procedure TibcPersistentInfo.StoreFormSettings(AForm: TForm; Id: string); var wSettings: TWinSettings; begin if FRegistry.OpenKey(gRegSettingsKey, TRUE) then begin wSettings._Top := AForm.Top; wSettings._Left := AForm.Left; wSettings._Height := AForm.Height; wSettings._Width := AForm.Width; wSettings._State := AForm.WindowState; wSettings._Read := TRUE; FRegistry.WriteBinaryData(Id, wSettings, SizeOf(TWinSettings)); FRegistry.CloseKey; end; end; procedure TibcPersistentInfo.GetSettings(var Settings: TAppSettings); var i: integer; begin if FRegistry.OpenKey(gRegSettingsKey, FALSE) then begin for i := 0 to NUM_SETTINGS - 1 do GetSetting(TPersistentSetting(Settings[i])); FRegistry.CloseKey; end; end; procedure TibcPersistentInfo.StoreSettings(Settings: TAppSettings); var i: integer; begin FRegistry.OpenKey(gRegSettingsKey, true); for i := 0 to NUM_SETTINGS - 1 do begin { case TVarData(gAppSettings[i].Setting).VType of varBoolean: WriteBool(gAppSettings[l].Name, gAppSettings[l].Setting); varString: WriteString(gAppSettings[l].Name, gAppSettings[l].Setting); varInteger: WriteInteger(gAppSettings[l].Name, gAppSettings[l].Setting); } StoreSetting(TPersistentSetting(Settings[i])); end; FRegistry.CloseKey; end; function TibcPersistentInfo.ServerAliasExists(Alias: string): boolean; begin Result := FRegistry.KeyExists(Format('%s%s',[gRegServersKey, Alias])); end; procedure TibcPersistentInfo.DeleteServerAlias(Alias: string); begin FRegistry.CloseKey; // FRegistry.DeleteKey(Format('%s%s\Databases',[gRegServersKey,Node])); FRegistry.DeleteKey(Format('%s%s',[gRegServersKey, Alias])); end; procedure TibcPersistentInfo.RenameServerAlias(SrcAlias, DestAlias: string); begin // if an alias already exists an exception should be raised here? FRegistry.MoveKey(Format('%s%s',[gRegServersKey, SrcAlias]), Format('%s%s',[gRegServersKey, DestAlias]), TRUE); end; procedure TibcPersistentInfo.GetServerAliases(Aliases: TStrings); begin if FRegistry.OpenKey(gRegServersKey, FALSE) then begin FRegistry.GetKeyNames(Aliases); FRegistry.CloseKey; end else Aliases.Clear; end; procedure TibcPersistentInfo.GetServerProps(Alias: string; var ServerProps: TibcServerProps); begin ServerProps.ServerName := ''; ServerProps.UserName := ''; ServerProps.Description := ''; ServerProps.Protocol := Local; if FRegistry.OpenKey(Format('%s%s',[gRegServersKey, Alias]), FALSE) then begin try case FRegistry.ReadInteger('Protocol') of 0: ServerProps.Protocol := TCP; 1: ServerProps.Protocol := NamedPipe; 2: ServerProps.Protocol := SPX; 3: ServerProps.Protocol := Local; end; ServerProps.ServerName := FRegistry.ReadString('ServerName'); ServerProps.UserName := FRegistry.ReadString('UserName'); ServerProps.Description := FRegistry.ReadString('Description'); ServerProps.LastAccessed := FRegistry.ReadDateTime ('Last Accessed'); finally FRegistry.CloseKey; end; end else raise EPersistent.Create('Persistent data read error. Server alias not found: ' + Alias); end; procedure TibcPersistentInfo.StoreServerProps(Alias: string; ServerProps: TibcServerProps); begin if FRegistry.OpenKey(Format('%s%s',[gRegServersKey, Alias]), TRUE) then begin try FRegistry.WriteString('ServerName', ServerProps.ServerName); case ServerProps.Protocol of TCP: FRegistry.WriteInteger('Protocol',0); NamedPipe: FRegistry.WriteInteger('Protocol',1); SPX: FRegistry.WriteInteger('Protocol',2); Local: FRegistry.WriteInteger('Protocol',3); end; FRegistry.WriteString('Username', ServerProps.Username); FRegistry.WriteString('Description', ServerProps.Description); FRegistry.WriteDateTime('Last Accessed', ServerProps.LastAccessed); finally FRegistry.CloseKey; end; end else raise EPersistent.Create('Persistent data write error. Cannot access server alias: ' + Alias); end; function TibcPersistentInfo.DatabaseAliasExists(ServerName, AliasName: string): boolean; begin Result := FRegistry.KeyExists(Format('%s%s\Databases\%s',[gRegServersKey, ServerName, AliasName])); end; procedure TibcPersistentInfo.GetDatabaseProps(ServerAlias, DatabaseAlias: string; var DatabaseProps: TibcDatabaseProps); begin DatabaseProps.DatabaseFiles := ''; DatabaseProps.UserName := ''; DatabaseProps.Role := ''; DatabaseProps.CharacterSet := ''; DatabaseProps.CaseSensitiveRole := FALSE; if FRegistry.OpenKey(Format('%s%s\Databases\%s',[gRegServersKey, ServerAlias, DatabaseAlias]), FALSE) then begin try DatabaseProps.DatabaseFiles := FRegistry.ReadString('DatabaseFiles'); DatabaseProps.UserName := FRegistry.ReadString('Username'); DatabaseProps.Role := FRegistry.ReadString('Role'); DatabaseProps.CharacterSet := FRegistry.ReadString('CharacterSet'); try DatabaseProps.CaseSensitiveRole := FRegistry.ReadBool('CaseSensitiveRole'); except DatabaseProps.CaseSensitiveRole := FALSE; end; finally FRegistry.CloseKey; end end else raise EPersistent.Create('Persistent data read error. Database alias not found: ' + DatabaseAlias); end; procedure TibcPersistentInfo.StoreDatabaseProps(ServerAlias, DatabaseAlias: string; var DatabaseProps: TibcDatabaseProps); begin if FRegistry.OpenKey(Format('%s%s\Databases\%s',[gRegServersKey, ServerAlias, DatabaseAlias]), TRUE) then begin try FRegistry.WriteString('DatabaseFiles', DatabaseProps.DatabaseFiles); FRegistry.WriteString('Username', DatabaseProps.Username); FRegistry.WriteString('Role', DatabaseProps.Role); FRegistry.WriteBool('CaseSensitiveRole', DatabaseProps.CaseSensitiveRole); FRegistry.WriteString('CharacterSet', DatabaseProps.CharacterSet); finally FRegistry.CloseKey; end; end else raise EPersistent.Create('Persistent data write error. Cannot access database alias: ' + DatabaseAlias); end; procedure TibcPersistentInfo.GetExternalApps(ExternalApps: TStrings); var iCount, i: integer; begin with FRegistry do begin if OpenKey (gRegToolsKey, false) and ValueExists('Count') then begin iCount := ReadInteger ('Count'); for i := 0 to iCount - 1 do gExternalApps.Add(ReadString (Format('Title%d', [i]))); end; CloseKey; end; end; procedure TibcPersistentInfo.StoreExternalApp(Title, Path, WordDir, Params: string; Update: boolean); begin end; procedure TibcPersistentInfo.DeleteExternalApp(Title: string); begin end; end. |
Update of /cvsroot/firebird/ibconsole In directory slayer.i.sourceforge.net:/tmp/cvs-serv32659 Modified Files: IBConsole.dof IBConsole.dpr IBConsole.res IBExtract.pas dmuMain.dti dmuMain.pas frmuAbout.pas frmuBackupAliasProperties.pas frmuCommDiag.dfm frmuCommDiag.pas frmuDBBackup.pas frmuDBConnect.dfm frmuDBConnect.pas frmuDBConnections.pas frmuDBCreate.pas frmuDBProperties.pas frmuDBRegister.dfm frmuDBRegister.pas frmuDBRestore.pas frmuDBShutdown.pas frmuDBStatistics.pas frmuDBTransactions.pas frmuDBValidation.pas frmuDBValidationReport.pas frmuMain.dfm frmuMain.pas frmuMessage.pas frmuModifyServerAlias.pas frmuObjectWindow.dfm frmuObjectWindow.pas frmuSQLOptions.dfm frmuSQLOptions.pas frmuServerLogin.pas frmuServerProperties.pas frmuServerRegister.pas frmuUser.pas wisql.dfm wisql.pas zluCommDiag.pas zluGlobal.pas zluSQL.pas zluUtility.pas zluibcClasses.pas Log Message: Update to version 324 Index: IBConsole.dof =================================================================== RCS file: /cvsroot/firebird/ibconsole/IBConsole.dof,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** IBConsole.dof 2000/09/21 14:57:20 1.5 --- IBConsole.dof 2000/12/04 09:52:49 1.6 *************** *** 58,62 **** MinorVer=0 Release=0 ! Build=319 Debug=0 PreRelease=0 --- 58,62 ---- MinorVer=0 Release=0 ! Build=324 Debug=0 PreRelease=0 *************** *** 69,73 **** CompanyName=Inprise Corporation FileDescription=IBConsole.exe ! FileVersion=1.0.0.319 InternalName= LegalCopyright=Copyright © 2000 Inprise Corporation --- 69,73 ---- CompanyName=Inprise Corporation FileDescription=IBConsole.exe ! FileVersion=1.0.0.324 InternalName= LegalCopyright=Copyright © 2000 Inprise Corporation *************** *** 78,81 **** --- 78,82 ---- Comments= [Excluded Packages] + $(DELPHI)\Projects\Bpl\doqbbde50.bpl=Open QBuilder BDE Engine $(DELPHI)\Bin\dclite50.bpl=Borland Integrated Translation Environment $(DELPHI)\Projects\Bpl\rbIP45.bpl=ReportBuilder wwRichEdit support *************** *** 83,91 **** [HistoryLists\hlDebugSourcePath] Count=1 ! Item0=$(DELPHI)\ibdac;$(DELPHI)\db;$(DELPHI)\midas ! [HistoryLists\hlConditionals] ! Count=2 ! Item0=DEBUG_ONLY;IB6_ONLY ! Item1=DEBUG_ONLY [HistoryLists\hlUnitAliases] Count=1 --- 84,88 ---- [HistoryLists\hlDebugSourcePath] Count=1 ! Item0=$(DELPHI)\lib\ip2000d5\source;$(DELPHI)\RBuilder4\Source [HistoryLists\hlUnitAliases] Count=1 *************** *** 94,111 **** Count=3 Item0=$(DELPHI)\ibx\packages ! Item1=$(DELPHI)\Experts\GExperts ! Item2=$(DELPHI)\ibdac;$(DELPHI)\db;$(DELPHI)\midas ! [HistoryLists\hlUnitOutputDirectory] ! Count=2 ! Item0=$(DELPHI)\Lib ! Item1=$(DELPHI)\Lib\Debug ! [HistoryLists\hlBPLOutput] ! Count=3 ! Item0=c:\winnt\system32 ! Item1=$(DELPHI)\bin ! Item2=c:\windows\system32 ! [HistoryLists\hlDCPOutput] ! Count=3 ! Item0=$(DELPHI)\lib ! Item1=$(DELPHI)\lib\Debug ! Item2=$DELPHI)\lib --- 91,94 ---- Count=3 Item0=$(DELPHI)\ibx\packages ! Item1=$(DELPHI)\SynEdit\source ! Item2=..\source Index: IBConsole.dpr =================================================================== RCS file: /cvsroot/firebird/ibconsole/IBConsole.dpr,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** IBConsole.dpr 2000/08/21 11:11:23 1.2 --- IBConsole.dpr 2000/12/04 09:52:49 1.3 *************** *** 46,50 **** frmuAddTool in 'frmuAddTool.pas' {frmAddTools}, frmuDescription in 'frmuDescription.pas' {frmDescription}, ! frmuWindowList in 'frmuWindowList.pas' {dlgWindowList}; {$R *.RES} --- 46,52 ---- frmuAddTool in 'frmuAddTool.pas' {frmAddTools}, frmuDescription in 'frmuDescription.pas' {frmDescription}, ! frmuWindowList in 'frmuWindowList.pas' {dlgWindowList}, ! MemoLists in 'MemoLists.pas', ! zluPersistent in 'zluPersistent.pas'; {$R *.RES} *************** *** 63,67 **** end; Application.Initialize; ! frmSplash := TfrmSplash.Create(Application); frmSplash.Show; frmSplash.Update; --- 65,69 ---- end; Application.Initialize; ! frmSplash := TfrmSplash.Create(nil); frmSplash.Show; frmSplash.Update; Index: IBConsole.res =================================================================== RCS file: /cvsroot/firebird/ibconsole/IBConsole.res,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 Binary files /tmp/cvsEgF6eg and /tmp/cvsOcUKmm differ Index: IBExtract.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/IBExtract.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** IBExtract.pas 2000/09/21 14:57:20 1.4 --- IBExtract.pas 2000/12/04 09:52:49 1.5 *************** *** 35,39 **** TExtractType = (etDomain, etTable, etRole, etTrigger, etForeign, ! etIndex, etData, etGrant, etCheck); TExtractTypes = Set of TExtractType; --- 35,39 ---- TExtractType = (etDomain, etTable, etRole, etTrigger, etForeign, ! etIndex, etData, etGrant, etCheck, etAlterProc); TExtractTypes = Set of TExtractType; *************** *** 63,67 **** procedure ListRoles(ObjectName : String = ''); procedure ListGrants; ! procedure ListProcs(ProcedureName : String = ''); procedure ListAllTables(flag : Boolean); procedure ListTriggers(ObjectName : String = ''; ExtractType : TExtractType = etTrigger); --- 63,67 ---- procedure ListRoles(ObjectName : String = ''); procedure ListGrants; ! procedure ListProcs(ProcedureName : String = ''; AlterOnly : Boolean = false); procedure ListAllTables(flag : Boolean); procedure ListTriggers(ObjectName : String = ''; ExtractType : TExtractType = etTrigger); *************** *** 533,537 **** if not qryTables.FieldByName('RDB$DIMENSIONS').IsNull then ! Column := column + GetArrayField(qryTables.FieldByName('RDB$FIELD_NAME').AsString); if FieldType = blr_blob then --- 533,537 ---- if not qryTables.FieldByName('RDB$DIMENSIONS').IsNull then ! Column := column + GetArrayField(qryTables.FieldByName('RDB$FIELD_NAME1').AsString); if FieldType = blr_blob then *************** *** 894,898 **** procname -- Name of procedure to investigate } ! procedure TIBExtract.ListProcs(ProcedureName : String); resourcestring CreateProcedureStr1 = 'CREATE PROCEDURE %s '; --- 894,898 ---- procname -- Name of procedure to investigate } ! procedure TIBExtract.ListProcs(ProcedureName : String; AlterOnly : Boolean); resourcestring CreateProcedureStr1 = 'CREATE PROCEDURE %s '; *************** *** 928,951 **** qryProcedures.Params.ByName('ProcedureName').AsString := ProcedureName; end; ! qryProcedures.ExecQuery; ! while not qryProcedures.Eof do begin ! if Header then begin ! FMetaData.Add('COMMIT WORK;'); ! FMetaData.Add('SET AUTODDL OFF;'); ! FMetaData.Add(Format('SET TERM %s %s', [ProcTerm, Term])); ! FMetaData.Add(Format('%s/* Stored procedures */%s', [NEWLINE, NEWLINE])); ! Header := false; end; ! ProcName := Trim(qryProcedures.FieldByName('RDB$PROCEDURE_NAME').AsString); ! FMetaData.Add(Format(CreateProcedureStr1, [QuoteIdentifier(FDatabase.SQLDialect, ! ProcName)])); ! GetProcedureArgs(ProcName); ! FMetaData.Add(Format(CreateProcedureStr2, [ProcTerm, NEWLINE])); ! qryProcedures.Next; end; - qryProcedures.Close; qryProcedures.ExecQuery; while not qryProcedures.Eof do --- 928,954 ---- qryProcedures.Params.ByName('ProcedureName').AsString := ProcedureName; end; ! if not AlterOnly then begin ! qryProcedures.ExecQuery; ! while not qryProcedures.Eof do begin ! if Header then ! begin ! FMetaData.Add('COMMIT WORK;'); ! FMetaData.Add('SET AUTODDL OFF;'); ! FMetaData.Add(Format('SET TERM %s %s', [ProcTerm, Term])); ! FMetaData.Add(Format('%s/* Stored procedures */%s', [NEWLINE, NEWLINE])); ! Header := false; ! end; ! ProcName := Trim(qryProcedures.FieldByName('RDB$PROCEDURE_NAME').AsString); ! FMetaData.Add(Format(CreateProcedureStr1, [QuoteIdentifier(FDatabase.SQLDialect, ! ProcName)])); ! GetProcedureArgs(ProcName); ! FMetaData.Add(Format(CreateProcedureStr2, [ProcTerm, NEWLINE])); ! qryProcedures.Next; end; ! qryProcedures.Close; end; qryProcedures.ExecQuery; while not qryProcedures.Eof do *************** *** 957,963 **** GetProcedureArgs(ProcName); if not qryProcedures.FieldByName('RDB$PROCEDURE_SOURCE').IsNull then ! SList.Text := SList.Text + qryProcedures.FieldByName('RDB$PROCEDURE_SOURCE').AsString; ! SList.Add(Format(' %s%s', [ProcTerm, NEWLINE])); FMetaData.AddStrings(SList); qryProcedures.Next; --- 960,973 ---- GetProcedureArgs(ProcName); + FMetaData.AddStrings(SList); + SList.Clear; if not qryProcedures.FieldByName('RDB$PROCEDURE_SOURCE').IsNull then ! begin ! SList.Text := qryProcedures.FieldByName('RDB$PROCEDURE_SOURCE').AsString; ! while (Slist.Count > 0) and (Trim(SList[0]) = '') do ! SList.Delete(0); ! end; ! if not AlterOnly then ! SList.Add(Format(' %s%s', [ProcTerm, NEWLINE])); FMetaData.AddStrings(SList); qryProcedures.Next; *************** *** 1557,1561 **** 0, FALSE); if not qryDomains.FieldByName('RDB$DIMENSIONS').IsNull then ! Result := GetArrayField(FieldName); if not qryDomains.FieldByName('RDB$DEFAULT_SOURCE').IsNull then --- 1567,1571 ---- 0, FALSE); if not qryDomains.FieldByName('RDB$DIMENSIONS').IsNull then ! Result := Result + GetArrayField(FieldName); if not qryDomains.FieldByName('RDB$DEFAULT_SOURCE').IsNull then *************** *** 2445,2449 **** end; eoView : ListViews(ObjectName); ! eoProcedure : ListProcs(ObjectName); eoFunction : ListFunctions(ObjectName); eoGenerator : ListGenerators(ObjectName); --- 2455,2459 ---- end; eoView : ListViews(ObjectName); ! eoProcedure : ListProcs(ObjectName, (etAlterProc in ExtractTypes)); eoFunction : ListFunctions(ObjectName); eoGenerator : ListGenerators(ObjectName); *************** *** 2863,2867 **** i, CollationID, CharSetID : Integer; begin ! Result := Format(' %s ', [qryHeader.FieldByName('RDB$PARAMETER_NAME').AsString]); for i := Low(ColumnTypes) to High(ColumnTypes) do if qryHeader.FieldByName('RDB$FIELD_TYPE').AsInteger = ColumnTypes[i].SQLType then --- 2873,2877 ---- i, CollationID, CharSetID : Integer; begin ! Result := Format(' %s ', [QuoteIdentifier(FDatabase.SQLDialect, qryHeader.FieldByName('RDB$PARAMETER_NAME').AsString)]); for i := Low(ColumnTypes) to High(ColumnTypes) do if qryHeader.FieldByName('RDB$FIELD_TYPE').AsInteger = ColumnTypes[i].SQLType then Index: dmuMain.dti =================================================================== RCS file: /cvsroot/firebird/ibconsole/dmuMain.dti,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** dmuMain.dti 2000/08/23 09:13:03 1.3 --- dmuMain.dti 2000/12/04 09:52:49 1.4 *************** *** 21,25 **** PrintSelected=0 PrintVisible=0 ! ExpandedItems= [DataDiagrams] --- 21,25 ---- PrintSelected=0 PrintVisible=0 ! ExpandedItems=dmMain [DataDiagrams] Index: dmuMain.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/dmuMain.pas,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** dmuMain.pas 2000/09/04 14:18:40 1.4 --- dmuMain.pas 2000/12/04 09:52:49 1.5 *************** *** 678,682 **** end; ! lSQLStr := Format('%s ORDER BY RDB$GENERATOR_ID',[lSQLStr]); SQL.Clear; SQL.Add(lSQLStr); --- 678,682 ---- end; ! lSQLStr := Format('%s ORDER BY RDB$GENERATOR_NAME',[lSQLStr]); SQL.Clear; SQL.Add(lSQLStr); *************** *** 1982,1986 **** lSQLStr := Format('%s Where RDB$SYSTEM_FLAG <> 1 OR RDB$SYSTEM_FLAG is NULL',[lSQLStr]); ! lSqlStr := Format('%s order by rdb$generator_id', [lSqlStr]); lQry := nil; --- 1982,1986 ---- lSQLStr := Format('%s Where RDB$SYSTEM_FLAG <> 1 OR RDB$SYSTEM_FLAG is NULL',[lSQLStr]); ! lSqlStr := Format('%s order by rdb$generator_name', [lSqlStr]); lQry := nil; Index: frmuAbout.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuAbout.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuAbout.pas 2000/09/04 14:18:40 1.2 --- frmuAbout.pas 2000/12/04 09:52:49 1.3 *************** *** 96,100 **** frmAbout: TfrmAbout; begin ! frmAbout := TfrmAbout.Create(Application); with frmAbout do begin --- 96,100 ---- frmAbout: TfrmAbout; begin ! frmAbout := TfrmAbout.Create(Application.MainForm); with frmAbout do begin Index: frmuBackupAliasProperties.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuBackupAliasProperties.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuBackupAliasProperties.pas 2000/08/21 11:11:24 1.2 --- frmuBackupAliasProperties.pas 2000/12/04 09:52:49 1.3 *************** *** 122,126 **** lCurrLine: string; begin ! frmBackupAliasProperties := TfrmBackupAliasProperties.Create(Application); try // set server name and backup alias --- 122,126 ---- lCurrLine: string; begin ! frmBackupAliasProperties := TfrmBackupAliasProperties.Create(Application.MainForm); try // set server name and backup alias Index: frmuCommDiag.dfm =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuCommDiag.dfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuCommDiag.dfm 2000/08/21 11:11:24 1.2 --- frmuCommDiag.dfm 2000/12/04 09:52:49 1.3 *************** *** 249,253 **** Width = 175 Height = 21 ! ItemHeight = 13 TabOrder = 0 end --- 249,253 ---- Width = 175 Height = 21 ! ItemHeight = 0 TabOrder = 0 end *************** *** 295,299 **** Width = 185 Height = 21 ! ItemHeight = 13 TabOrder = 0 end --- 295,299 ---- Width = 185 Height = 21 ! ItemHeight = 0 TabOrder = 0 end *************** *** 331,335 **** Width = 185 Height = 21 ! ItemHeight = 13 TabOrder = 0 end --- 331,335 ---- Width = 185 Height = 21 ! ItemHeight = 0 TabOrder = 0 end Index: frmuCommDiag.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuCommDiag.pas,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** frmuCommDiag.pas 2000/08/03 20:15:00 1.1.1.1 --- frmuCommDiag.pas 2000/12/04 09:52:49 1.2 *************** *** 15,19 **** * Corporation. All Rights Reserved. * ! * Contributor(s): ______________________________________. } --- 15,19 ---- * Corporation. All Rights Reserved. * ! * Contributor(s): Krzysztof Golko. } *************** *** 41,45 **** uses Windows, SysUtils,Forms, ExtCtrls, StdCtrls, Classes, Controls, ComCtrls, Dialogs, ! Graphics, zluibcClasses, zluCommDiag, Winsock, IB, ScktComp, Registry, IBDatabase, IBDatabaseInfo, Messages, frmuDlgClass; --- 41,45 ---- uses Windows, SysUtils,Forms, ExtCtrls, StdCtrls, Classes, Controls, ComCtrls, Dialogs, ! Graphics, zluibcClasses, zluCommDiag, Winsock, IB, ScktComp, IBDatabase, IBDatabaseInfo, Messages, frmuDlgClass; *************** *** 101,105 **** { Private declarations } FProtocols: TStringList; - FRegistry: TRegistry; FServers: TStringList; function VerifyInputData(): boolean; --- 101,104 ---- *************** *** 130,134 **** uses ! zluGlobal, zluContextHelp, IBServices, frmuMessage; {$R *.DFM} --- 129,133 ---- uses ! zluGlobal, zluPersistent, zluContextHelp, IBServices, frmuMessage; {$R *.DFM} *************** *** 157,161 **** frmCommDiag: TfrmCommDiag; begin ! frmCommDiag:= TfrmCommDiag.Create(Application); try // determine if a server is currently selected --- 156,160 ---- frmCommDiag: TfrmCommDiag; begin ! frmCommDiag:= TfrmCommDiag.Create(Application.MainForm); try // determine if a server is currently selected *************** *** 974,1036 **** var lCount : Integer ; ! iProtocol : Integer; ! lServerAlias : TStringList; ! lStr : String; ! lRegServersKey : String; begin inherited; - FRegistry := Nil; // initialize variables FServers := Nil; FProtocols := Nil; ! lServerAlias :=Nil; pgcDiagnostics.ActivePageIndex := 0; try - FRegistry := TRegistry.Create; FServers := TStringList.Create; FProtocols := TStringList.Create; ! lServerAlias := TStringList.Create; - FRegistry.OpenKey('Software', False); - FRegistry.OpenKey('Borland', False); - FRegistry.OpenKey('Interbase', False); - FRegistry.OpenKey('IBConsole', False); - FRegistry.CreateKey('Servers'); - lRegServersKey := Format('\%s\Servers\',[FRegistry.CurrentPath]); - // if server entries are found - if FRegistry.OpenKey(lRegServersKey,False) then begin // get all server aliases ! FRegistry.GetKeyNames(lServerAlias); // loop through list of aliases to get server names ! for lCount := 0 to lServerAlias.Count - 1 do begin ! if FRegistry.OpenKey(Format('%s%s',[lRegServersKey,lServerAlias.Strings[lCount]]),False) then ! begin ! // get server names and protocols ! lStr := FRegistry.ReadString('ServerName'); ! iProtocol := FRegistry.ReadInteger('Protocol'); ! // Only add remote servers (and their protocol) to stringlists ! if lStr <> 'Local Server' then ! begin ! FServers.Add(lStr); ! FProtocols.Add(IntToStr(iProtocol)); ! end; end; end; end; - // add remote servers to all server combo boxes - for lCount := 0 to FServers.Count - 1 do - begin - cbDBServer.Items.Add(FServers.Strings[lCount]); - cbTCPIPServer.Items.Add(FServers.Strings[lCount]); - cbNetBEUIServer.Items.Add(FServers.Strings[lCount]); - cbSPXServer.Items.Add(FServers.Strings[lCount]); - end; finally ! FRegistry.CloseKey; ! lServerAlias.Free; end; end; --- 973,1012 ---- var lCount : Integer ; ! lServerAliases : TStringList; ! sProps: TibcServerProps; begin inherited; FServers := Nil; FProtocols := Nil; ! lServerAliases :=Nil; pgcDiagnostics.ActivePageIndex := 0; try FServers := TStringList.Create; FProtocols := TStringList.Create; ! lServerAliases := TStringList.Create; // if server entries are found begin // get all server aliases ! PersistentInfo.GetServerAliases(lServerAliases); // loop through list of aliases to get server names ! for lCount := 0 to lServerAliases.Count - 1 do begin ! PersistentInfo.GetSerVerProps(lServerAliases[lCount], sProps); // Only add remote servers (and their protocol) to stringlists ! if sProps.ServerName <> 'Local Server' then ! begin ! FServers.Add(sProps.ServerName); ! FProtocols.Add(IntToStr(integer(sProps.Protocol))); ! cbDBServer.Items.Add(sProps.ServerName); ! cbTCPIPServer.Items.Add(sProps.ServerName); ! cbNetBEUIServer.Items.Add(sProps.ServerName); ! cbSPXServer.Items.Add(sProps.ServerName); end; end; end; finally ! lServerAliases.Free; end; end; *************** *** 1039,1044 **** procedure TfrmCommDiag.FormDestroy(Sender: TObject); begin - FRegistry.Free; - FServers.Free; FProtocols.Free; end; --- 1015,1018 ---- Index: frmuDBBackup.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBBackup.pas,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** frmuDBBackup.pas 2000/09/04 14:18:40 1.3 --- frmuDBBackup.pas 2000/12/04 09:52:49 1.4 *************** *** 843,847 **** lGridRect : TGridRect; found: boolean; - fp: string; begin --- 843,846 ---- *************** *** 904,919 **** begin if (sgBackupFiles.Cells[0,lCnt] <> '') then - begin found := true; - fp := ExtractFilePath(sgBackupFiles.Cells[0,lCnt]); - - if fp = '' then - begin - DisplayMsg(ERR_NO_PATH, 'File: '+sgBackupFiles.Cells[0,lCnt]); - sgBackupFiles.SetFocus; - result := false; - exit; - end; - end; end; --- 903,907 ---- *************** *** 960,964 **** frmDBBackup := nil; try ! frmDBBackup:= TfrmDBBackup.Create(Application); frmDBBackup.FSourceServerNode := SourceServerNode; frmDBBackup.FSourceDatabaseNode := SourceDatabaseNode; --- 948,952 ---- frmDBBackup := nil; try ! frmDBBackup:= TfrmDBBackup.Create(Application.MainForm); frmDBBackup.FSourceServerNode := SourceServerNode; frmDBBackup.FSourceDatabaseNode := SourceDatabaseNode; Index: frmuDBConnect.dfm =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBConnect.dfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuDBConnect.dfm 2000/08/21 11:11:24 1.2 --- frmuDBConnect.dfm 2000/12/04 09:52:50 1.3 *************** *** 17,20 **** --- 17,21 ---- Position = poScreenCenter Scaled = False + OnCreate = FormCreate OnHelp = FormHelp PixelsPerInch = 96 Index: frmuDBConnect.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBConnect.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuDBConnect.pas 2000/08/21 11:11:24 1.2 --- frmuDBConnect.pas 2000/12/04 09:52:50 1.3 *************** *** 15,19 **** * Corporation. All Rights Reserved. * ! * Contributor(s): ______________________________________. } --- 15,19 ---- * Corporation. All Rights Reserved. * ! * Contributor(s): Krzysztof Golko, Sergey Gavrilev. } *************** *** 63,66 **** --- 63,67 ---- procedure btnConnectClick(Sender: TObject); procedure edtRoleChange(Sender: TObject); + procedure FormCreate(Sender: TObject); private { Private declarations } *************** *** 70,119 **** end; ! function DBConnect(var CurrSelDatabase: TibcDatabaseNode; const CurrSelServer: TibcServerNode; const SilentConnect: boolean): boolean; implementation uses ! IBServices, frmuMessage, zluGlobal, zluContextHelp; {$R *.DFM} ! {**************************************************************** ! * ! * D B C o n n e c t ( ) ! * ! **************************************************************** ! * Author: The Client Server Factory Inc. ! * Date: March 1, 1999 ! * ! * Input: CurrSelDatabase - The specified database ! * CurrSelServer - The specified server ! * SilentConnect - Indicates whether or not to prompt ! * the user for login information or ! * to use the default login information. ! * ! * Return: Boolean - Indicates the success/failure of the operation ! * ! * Description: Connects to the specified database of the ! * specified server. If SilentConnect is false the ! * user is prompted for login information. ! * ! ***************************************************************** ! * Revisions: ! * ! *****************************************************************} ! function DBConnect(var CurrSelDatabase: TibcDatabaseNode; const CurrSelServer: TibcServerNode; const SilentConnect: boolean): boolean; var frmDBConnect: TfrmDBConnect; - attachDialect: integer; - //Kris 13-Aug-2000 start - attachCharSet: string; - //Kris 13-Aug-2000 end begin frmDBConnect := nil; CurrSelDatabase.UserName := CurrSelServer.UserName; CurrSelDatabase.Password := CurrSelServer.Password; // check if a SilentConnect is specified --- 71,147 ---- end; ! function DBConnect(CurrSelDatabase: TibcDatabaseNode; const CurrSelServer: TibcServerNode; const SilentConnect: boolean): boolean; implementation uses ! IBServices, IBDatabase, frmuMessage, zluGlobal, zluContextHelp; {$R *.DFM} ! function DoDBConnect(const CurrSelServer: TibcServerNode; CurrSelDatabase: TibcDatabaseNode): boolean; ! begin ! // check if not already connected ! if CurrSelDatabase.Database.Connected then ! begin ! Result := TRUE; ! Exit; ! end; ! ! try ! // check if a database file has been specified ! if CurrSelDatabase.DatabaseFiles.Count > 0 then ! begin ! // construct UNC path to database file ! case CurrSelServer.Server.Protocol of ! TCP: CurrSelDatabase.Database.DatabaseName := Format('%s:%s',[CurrSelServer.ServerName,CurrSelDatabase.DatabaseFiles.Strings[0]]); ! NamedPipe: CurrSelDatabase.Database.DatabaseName := Format('\\%s\%s',[CurrSelServer.ServerName,CurrSelDatabase.DatabaseFiles.Strings[0]]); ! SPX: CurrSelDatabase.Database.DatabaseName := Format('%s@%s',[CurrSelServer.ServerName,CurrSelDatabase.DatabaseFiles.Strings[0]]); ! Local: CurrSelDatabase.Database.DatabaseName := CurrSelDatabase.DatabaseFiles.Strings[0]; ! end; ! end; ! ! // clear database parameters and submit login details ! CurrSelDatabase.Database.Params.Clear; ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_user_name=%s',[CurrSelDatabase.UserName])); ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_password=%s',[CurrSelDatabase.Password])); ! if CurrSelDatabase.CaseSensitiveRole then ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_sql_role_name="%s"',[CurrSelDatabase.Role])) ! else ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_sql_role_name=%s',[CurrSelDatabase.Role])); ! ! if (CurrSelDatabase.CharacterSet <> '') and (CurrSelDatabase.CharacterSet <> 'None') then ! CurrSelDatabase.Database.Params.Add('isc_dpb_lc_ctype=' + CurrSelDatabase.CharacterSet); ! ! Screen.Cursor := crHourGlass; ! CurrSelDatabase.Database.Connected := true; ! Screen.Cursor := crDefault; ! except // if an exception occurs then trap it ! on E:EIBError do // and show error message ! begin ! Screen.Cursor := crDefault; ! DisplayMsg(ERR_DB_CONNECT, E.Message); ! end; ! end; ! Result := CurrSelDatabase.Database.Connected; ! end; ! ! { Input: CurrSelDatabase - The specified database[ CurrSelServer - The specified server ! SilentConnect - Indicates whether or not to prompt the user for login information or ! to use the default login information. ! Return: Boolean - Indicates the success/failure of the operation ! Description: Connects to the specified database of the specified server. ! If SilentConnect is false the user is prompted for login information. } ! function DBConnect(CurrSelDatabase: TibcDatabaseNode; const CurrSelServer: TibcServerNode; const SilentConnect: boolean): boolean; var frmDBConnect: TfrmDBConnect; begin frmDBConnect := nil; CurrSelDatabase.UserName := CurrSelServer.UserName; CurrSelDatabase.Password := CurrSelServer.Password; + if CurrSelDatabase.CaseSensitiveRole then + CurrSelDatabase.Database.SQLDialect := 3; // check if a SilentConnect is specified *************** *** 121,125 **** begin try ! frmDBConnect:= TfrmDBConnect.Create(Application); frmDBConnect.stxDatabaseName.Caption := CurrSelDatabase.NodeName; --- 149,153 ---- begin try ! frmDBConnect:= TfrmDBConnect.Create(Application.MainForm); frmDBConnect.stxDatabaseName.Caption := CurrSelDatabase.NodeName; *************** *** 127,268 **** frmDBConnect.edtRole.Text := CurrSelDatabase.Role; frmDBConnect.cbDialect.ItemIndex := 2; // default to dialect 3 ! // Kris 12-Aug-2000 start ! with frmDBConnect.cbCharacterSet do ! begin ! // This is temporary, list of vailable character sets is set in IBX ! // and in another place in IBConsole, it should be provided by IBX ! Items.Add('None'); ! Items.Add('ASCII'); ! Items.Add('BIG_5'); ! Items.Add('CYRL'); ! Items.Add('DOS437'); ! Items.Add('DOS850'); ! Items.Add('DOS852'); ! Items.Add('DOS857'); ! Items.Add('DOS860'); ! Items.Add('DOS861'); ! Items.Add('DOS863'); ! Items.Add('DOS865'); ! Items.Add('EUCJ_0208'); ! Items.Add('GB_2312'); ! Items.Add('ISO8859_1'); ! Items.Add('KSC_5601'); ! Items.Add('NEXT'); ! Items.Add('OCTETS'); ! Items.Add('SJIS_0208'); ! Items.Add('UNICODE_FSS'); ! Items.Add('WIN1250'); ! Items.Add('WIN1251'); ! Items.Add('WIN1252'); ! Items.Add('WIN1253'); ! Items.Add('WIN1254'); ! ItemIndex := 0; ! end; ! // Kris 12-Aug-2000 end ! frmDBConnect.ShowModal; ! // Kris 12-Aug-2000 end ! if frmDBConnect.ModalResult = mrOK then begin // set username, password and role CurrSelDatabase.UserName := frmDBConnect.edtUsername.Text; CurrSelDatabase.Password := frmDBConnect.edtPassword.Text; if frmDBConnect.cbCaseSensitive.Checked then ! begin ! CurrSelDatabase.Role := frmDBConnect.edtRole.Text; ! attachDialect := 3; ! end else begin ! CurrSelDatabase.Role := frmDBConnect.edtRole.Text; ! attachDialect := 1; end; - CurrSelDatabase.Database.SQLDialect := frmDBConnect.cbDialect.ItemIndex+1; - // Kris 12-Aug-2000 start - attachCharSet := frmDBConnect.cbCharacterSet.Text; - // Kris 12-Aug-2000 end end - else - begin - result := false; - Exit; - end; finally - // deallocate memory frmDBConnect.Free; end; end else ! if CurrSelDatabase.CaseSensitiveRole then ! attachDialect := 3 ! else ! attachDialect := 1; ! ! // if a silent connect was specified or the proper login information was supplied ! try ! Screen.Cursor := crHourGlass; ! // check if the database isn't already connected ! if (not Assigned(CurrSelDatabase.Database)) or ! (not CurrSelDatabase.Database.Connected) then ! begin ! // check if a database file has been specified ! if CurrSelDatabase.DatabaseFiles.Count > 0 then ! begin ! // construct UNC path to database file ! case CurrSelServer.Server.Protocol of ! TCP: CurrSelDatabase.Database.DatabaseName := Format('%s:%s',[CurrSelServer.ServerName,CurrSelDatabase.DatabaseFiles.Strings[0]]); ! NamedPipe: CurrSelDatabase.Database.DatabaseName := Format('\\%s\%s',[CurrSelServer.ServerName,CurrSelDatabase.DatabaseFiles.Strings[0]]); ! SPX: CurrSelDatabase.Database.DatabaseName := Format('%s@%s',[CurrSelServer.ServerName,CurrSelDatabase.DatabaseFiles.Strings[0]]); ! Local: CurrSelDatabase.Database.DatabaseName := CurrSelDatabase.DatabaseFiles.Strings[0]; ! end; ! end; ! // clear database parameters and submit login details ! CurrSelDatabase.Database.Params.Clear; ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_user_name=%s',[CurrSelDatabase.UserName])); ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_password=%s',[CurrSelDatabase.Password])); ! if attachDialect = 3 then ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_sql_role_name="%s"',[CurrSelDatabase.Role])) ! else ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_sql_role_name=%s',[CurrSelDatabase.Role])); ! CurrSelDatabase.Database.Params.Add(Format('isc_dpb_SQL_dialect=%d',[attachDialect])); ! // Kris 12-Aug-2000 start ! if (attachCharSet <> '') and (attachCharSet <> 'None') then ! CurrSelDatabase.Database.Params.Add('isc_dpb_lc_ctype=' + attachCharSet); ! // Kris 12-Aug-2000 end ! ! // attempt to connect to the database ! CurrSelDatabase.Database.Connected := true; ! Application.ProcessMessages; ! ! // Check to see if the database dialect matches, the client dialect ! with CurrSelDatabase.Database do begin ! if not SilentConnect then begin ! //Kris 15-Aug-2000 start ! //old code ! //if DBSQLDialect <> SQLDialect then ! // DisplayMsg (WAR_DIALECT_MISMATCH, ! // Format ('Database dialect (%d) does not match client dialect (%d).',[DBSQLDialect, SQLDialect])); ! if DBSQLDialect < SQLDialect then ! DisplayMsg (WAR_DIALECT_MISMATCH, ! Format ('Database dialect (%d) lesser than client dialect (%d).',[DBSQLDialect, SQLDialect])); ! //Kris 15-Aug-2000 end ! end else ! SQLDialect := DBSqlDialect; ! // Kris 14-Aug-2000 start ! gAppSettings[DEFAULT_DIALECT].Setting := SQLDialect; ! gAppSettings[CHARACTER_SET].Setting := attachCharSet; ! // Kris 14-Aug-2000 end ! end; ! end; ! result := true; ! Screen.Cursor := crDefault; ! except // if an exception occurs then trap it ! on E:EIBError do // and show error message ! begin ! DisplayMsg(ERR_DB_CONNECT,E.Message); ! result := false; ! Screen.Cursor := crDefault; ! { TODO: This was removed to remove a crash when connecting to a non-existent db } ! // CurrSelDatabase := nil; ! end; end; end; --- 155,195 ---- frmDBConnect.edtRole.Text := CurrSelDatabase.Role; frmDBConnect.cbDialect.ItemIndex := 2; // default to dialect 3 ! ! frmDBConnect.cbCharacterSet.ItemIndex := frmDBConnect.cbCharacterSet.Items.IndexOf(CurrSelDatabase.CharacterSet); ! ! Result := FALSE; ! while frmDBConnect.ShowModal = mrOK do begin // set username, password and role CurrSelDatabase.UserName := frmDBConnect.edtUsername.Text; CurrSelDatabase.Password := frmDBConnect.edtPassword.Text; + CurrSelDatabase.CharacterSet := frmDBConnect.cbCharacterSet.Text; + + CurrSelDatabase.Role := frmDBConnect.edtRole.Text; + // get SQL dialect + CurrSelDatabase.Database.SQLDialect := frmDBConnect.cbDialect.ItemIndex + 1; + // upgrade SQL dialect if case sensitive role name if frmDBConnect.cbCaseSensitive.Checked then ! CurrSelDatabase.Database.SQLDialect := 3; ! ! if DODBConnect(CurrSelServer, CurrSelDatabase) then begin ! Result := true; ! Break; end; end finally frmDBConnect.Free; end; end else ! begin ! Result := DoDBConnect(CurrSelServer, CurrSelDatabase); ! end; ! if Result then ! begin ! gAppSettings[DEFAULT_DIALECT].Setting := CurrSelDatabase.Database.SQLDialect; ! gAppSettings[CHARACTER_SET].Setting := CurrSelDatabase.CharacterSet; end; end; *************** *** 333,336 **** --- 260,298 ---- inherited; cbCaseSensitive.Enabled := (edtRole.GetTextLen > 0); + end; + + procedure TfrmDBConnect.FormCreate(Sender: TObject); + begin + inherited; + with cbCharacterSet do + begin + // This is temporary, list of vailable character sets is set in IBX + // and in another place in IBConsole, it should be provided by IBX + Items.Add('None'); + Items.Add('ASCII'); + Items.Add('BIG_5'); + Items.Add('CYRL'); + Items.Add('DOS437'); + Items.Add('DOS850'); + Items.Add('DOS852'); + Items.Add('DOS857'); + Items.Add('DOS860'); + Items.Add('DOS861'); + Items.Add('DOS863'); + Items.Add('DOS865'); + Items.Add('EUCJ_0208'); + Items.Add('GB_2312'); + Items.Add('ISO8859_1'); + Items.Add('KSC_5601'); + Items.Add('NEXT'); + Items.Add('OCTETS'); + Items.Add('SJIS_0208'); + Items.Add('UNICODE_FSS'); + Items.Add('WIN1250'); + Items.Add('WIN1251'); + Items.Add('WIN1252'); + Items.Add('WIN1253'); + Items.Add('WIN1254'); + end; end; Index: frmuDBConnections.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBConnections.pas,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** frmuDBConnections.pas 2000/08/03 20:15:01 1.1.1.1 --- frmuDBConnections.pas 2000/12/04 09:52:50 1.2 *************** *** 82,88 **** try Screen.Cursor := crHourGlass; ! frmDBConnections := TfrmDBConnections.Create(Application); ! lDatabase := TIBDatabase.Create(Application); ! lIBDBInfo := TIBDatabaseInfo.Create(Application); try case CurrSelServer.Server.Protocol of --- 82,88 ---- try Screen.Cursor := crHourGlass; ! frmDBConnections := TfrmDBConnections.Create(Application.MainForm); ! lDatabase := TIBDatabase.Create(frmDBConnections); ! lIBDBInfo := TIBDatabaseInfo.Create(frmDBConnections); try case CurrSelServer.Server.Protocol of Index: frmuDBCreate.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBCreate.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuDBCreate.pas 2000/09/21 14:57:20 1.2 --- frmuDBCreate.pas 2000/12/04 09:52:50 1.3 *************** *** 3,9 **** * Version 1.0 (the "License"); you may not use this file except in * compliance with the License. ! * * You may obtain a copy of the License at http://www.Inprise.com/IPL.html. ! * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See --- 3,9 ---- * Version 1.0 (the "License"); you may not use this file except in * compliance with the License. ! * * You may obtain a copy of the License at http://www.Inprise.com/IPL.html. ! * * Software distributed under the License is distributed on an "AS IS" * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See *************** *** 11,19 **** * under the License. The Original Code was created by Inprise * Corporation and its predecessors. ! * * Portions created by Inprise Corporation are Copyright (C) Inprise * Corporation. All Rights Reserved. ! * ! * Contributor(s): ______________________________________. } --- 11,19 ---- * under the License. The Original Code was created by Inprise * Corporation and its predecessors. ! * * Portions created by Inprise Corporation are Copyright (C) Inprise * Corporation. All Rights Reserved. ! * ! * Contributor(s): Krzysztof Golko. } *************** *** 87,91 **** implementation ! uses zluGlobal,frmuMessage, zluContextHelp, zluUtility, Registry; {$R *.DFM} --- 87,91 ---- implementation ! uses zluGlobal,frmuMessage, zluContextHelp, zluUtility, zluPersistent; {$R *.DFM} *************** *** 129,135 **** lStr: String; // string value for starting page begin ! frmDBCreate := TfrmDBCreate.Create(Application); try - lDatabase := TIBDatabase.Create(Nil); // create database object // set server name in form frmDBCreate.stxServer.Caption := SelServerNode.Servername; --- 129,135 ---- lStr: String; // string value for starting page begin ! frmDBCreate := TfrmDBCreate.Create(Application.MainForm); ! lDatabase := TIBDatabase.Create(nil); // create database object try // set server name in form frmDBCreate.stxServer.Caption := SelServerNode.Servername; *************** *** 201,204 **** --- 201,205 ---- // deallocate memory frmDBCreate.Free; + lDatabase.Free; end; end; *************** *** 238,242 **** iPageSize : Integer; // integer page size lGridRect : TGridRect; // current gridregion being validated - lRegistry : TRegistry; begin result := true; // assume all data is valid --- 239,242 ---- *************** *** 251,265 **** end; ! lRegistry := TRegistry.Create; ! if lRegistry.KeyExists(Format('%s%s\Databases\%s',[gRegServersKey,FCurrSelServer.Nodename,edtDBAlias.Text])) then begin // show error message DisplayMsg(ERR_DB_ALIAS,'This database alias already exists.'); edtDBAlias.SetFocus; // give focus to control result := false; - lRegistry.Free; Exit; end; ! lRegistry.Free; ! // determine the maximum number of rows that have been used iMax:=1; --- 251,262 ---- end; ! if PersistentInfo.DatabaseAliasExists(FCurrSelServer.NodeName, edtDBAlias.Text) then begin // show error message DisplayMsg(ERR_DB_ALIAS,'This database alias already exists.'); edtDBAlias.SetFocus; // give focus to control result := false; Exit; end; ! // determine the maximum number of rows that have been used iMax:=1; *************** *** 393,400 **** sgOptions.Cells[OPTION_NAME_COL,DEFAULT_CHARSET_ROW] := 'Default Character Set'; ! sgOptions.Cells[OPTION_VALUE_COL,DEFAULT_CHARSET_ROW] := 'None'; sgOptions.Cells[OPTION_NAME_COL,SQL_DIALECT_ROW] := 'SQL Dialect'; ! sgOptions.Cells[OPTION_VALUE_COL,SQL_DIALECT_ROW] := '3'; pnlOptionName.Caption := 'Page Size'; --- 390,397 ---- sgOptions.Cells[OPTION_NAME_COL,DEFAULT_CHARSET_ROW] := 'Default Character Set'; ! sgOptions.Cells[OPTION_VALUE_COL,DEFAULT_CHARSET_ROW] := gAppSettings[CHARACTER_SET].Setting; sgOptions.Cells[OPTION_NAME_COL,SQL_DIALECT_ROW] := 'SQL Dialect'; ! sgOptions.Cells[OPTION_VALUE_COL,SQL_DIALECT_ROW] := gAppSettings[DEFAULT_DIALECT].Setting; pnlOptionName.Caption := 'Page Size'; Index: frmuDBProperties.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBProperties.pas,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** frmuDBProperties.pas 2000/08/03 20:15:02 1.1.1.1 --- frmuDBProperties.pas 2000/12/04 09:52:50 1.2 *************** *** 880,884 **** bOriginalConnectStatus: boolean; begin ! frmDBProperties := TfrmDBProperties.Create(Application); lRegistry := TRegistry.Create(); lSubKeys := TStringList.Create(); --- 880,884 ---- bOriginalConnectStatus: boolean; begin ! frmDBProperties := TfrmDBProperties.Create(Application.MainForm); lRegistry := TRegistry.Create(); lSubKeys := TStringList.Create(); Index: frmuDBRegister.dfm =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBRegister.dfm,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuDBRegister.dfm 2000/08/21 11:11:24 1.2 --- frmuDBRegister.dfm 2000/12/04 09:52:50 1.3 *************** *** 6,10 **** BorderStyle = bsSingle Caption = 'Register Database and Connect' ! ClientHeight = 448 ClientWidth = 384 Color = clBtnFace --- 6,10 ---- BorderStyle = bsSingle Caption = 'Register Database and Connect' ! ClientHeight = 458 ClientWidth = 384 Color = clBtnFace *************** *** 115,124 **** Top = 229 Width = 355 ! Height = 172 Caption = ' Login Information ' TabOrder = 2 object lblUsername: TLabel Left = 15 ! Top = 30 Width = 75 Height = 16 --- 115,124 ---- Top = 229 Width = 355 ! Height = 188 Caption = ' Login Information ' TabOrder = 2 object lblUsername: TLabel Left = 15 ! Top = 34 Width = 75 Height = 16 *************** *** 129,133 **** object lblPassword: TLabel Left = 15 ! Top = 66 Width = 75 Height = 16 --- 129,133 ---- object lblPassword: TLabel Left = 15 ! Top = 70 Width = 75 Height = 16 *************** *** 138,142 **** object lblRole: TLabel Left = 15 ! Top = 103 Width = 75 Height = 16 --- 138,142 ---- object lblRole: TLabel Left = 15 ! Top = 107 Width = 75 Height = 16 *************** *** 145,152 **** FocusControl = edtRole end object edtUsername: TEdit ! Left = 96 Top = 30 ! Width = 245 Height = 21 CharCase = ecUpperCase --- 145,160 ---- FocusControl = edtRole end + object Label2: TLabel + Left = 14 + Top = 163 + Width = 105 + Height = 13 + Caption = 'Default Character &Set' + FocusControl = cbCharacterSet + end object edtUsername: TEdit ! Left = 128 Top = 30 ! Width = 213 Height = 21 CharCase = ecUpperCase *************** *** 155,161 **** end object edtPassword: TEdit ! Left = 96 Top = 66 ! Width = 245 Height = 21 MaxLength = 32 --- 163,169 ---- end object edtPassword: TEdit ! Left = 128 Top = 66 ! Width = 213 Height = 21 MaxLength = 32 *************** *** 164,170 **** end object edtRole: TEdit ! Left = 96 Top = 103 ! Width = 245 Height = 21 MaxLength = 31 --- 172,178 ---- end object edtRole: TEdit ! Left = 128 Top = 103 ! Width = 213 Height = 21 MaxLength = 31 *************** *** 181,188 **** TabOrder = 3 end end object btnOK: TButton Left = 221 ! Top = 410 Width = 75 Height = 25 --- 189,231 ---- TabOrder = 3 end + object cbCharacterSet: TComboBox + Left = 128 + Top = 156 + Width = 212 + Height = 21 + Style = csDropDownList + ItemHeight = 13 + TabOrder = 4 + Items.Strings = ( + 'None' + 'ASCII' + 'BIG_5' + 'CYRL' + 'DOS437' + 'DOS850' + 'DOS852' + 'DOS857' + 'DOS860' + 'DOS861' + 'DOS863' + 'DOS865' + 'EUCJ_0208' + 'GB_2312' + 'ISO8859_1' + 'KSC_5601' + 'NEXT' + 'OCTETS' + 'SJIS_0208' + 'UNICODE_FSS' + 'WIN1250' + 'WIN1251' + 'WIN1252' + 'WIN1253' + 'WIN1254') + end end object btnOK: TButton Left = 221 ! Top = 426 Width = 75 Height = 25 *************** *** 194,198 **** object btnCancel: TButton Left = 302 ! Top = 410 Width = 75 Height = 25 --- 237,241 ---- object btnCancel: TButton Left = 302 ! Top = 426 Width = 75 Height = 25 Index: frmuDBRegister.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBRegister.pas,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** frmuDBRegister.pas 2000/08/03 20:15:02 1.1.1.1 --- frmuDBRegister.pas 2000/12/04 09:52:50 1.2 *************** *** 15,19 **** * Corporation. All Rights Reserved. * ! * Contributor(s): ______________________________________. } --- 15,19 ---- * Corporation. All Rights Reserved. * ! * Contributor(s): Gavrilev Sergey. } *************** *** 40,44 **** uses SysUtils, Forms, ExtCtrls, StdCtrls, Classes, Controls, Dialogs, ! Windows, zluibcClasses, Messages, Registry, frmuDlgClass; type --- 40,44 ---- uses SysUtils, Forms, ExtCtrls, StdCtrls, Classes, Controls, Dialogs, ! Windows, zluibcClasses, Messages, frmuDlgClass; type *************** *** 64,67 **** --- 64,69 ---- btnCancel: TButton; cbCaseSensitive: TCheckBox; + cbCharacterSet: TComboBox; + Label2: TLabel; function FormHelp(Command: Word; Data: Integer; var CallHelp: Boolean): Boolean; procedure btnCancelClick(Sender: TObject); *************** *** 80,92 **** end; ! function RegisterDB(var DBAlias,Username,Password,Role: string; DatabaseFiles: TStringList; const SelServer: TibcServerNode; var SaveAlias, CaseSensitive: boolean): boolean; implementation uses ! IBServices, frmuMessage, zluGlobal, zluContextHelp, zluUtility; {$R *.DFM} --- 82,95 ---- end; ! function RegisterDB(var DBAlias,Username,Password,Role, CharacterSet: string; DatabaseFiles: TStringList; const SelServer: TibcServerNode; var SaveAlias, CaseSensitive: boolean): boolean; + implementation uses ! IBServices, frmuMessage, zluGlobal, zluContextHelp, zluUtility, zluPersistent; {$R *.DFM} *************** *** 110,114 **** * SelServer - The specified server * SaveAlias - Indicates whether or not to save the alias ! * information to the registry * * Return: boolean - Indicates the success/failure of the operation --- 113,117 ---- * SelServer - The specified server * SaveAlias - Indicates whether or not to save the alias ! * information to the persistent storage * * Return: boolean - Indicates the success/failure of the operation *************** *** 123,132 **** * *****************************************************************} ! function RegisterDB(var DBAlias, Username, Password, Role: string; DatabaseFiles: TStringList; const SelServer: TibcServerNode; var SaveAlias, CaseSensitive: boolean): boolean; var frmDBRegister: TfrmDBRegister; begin ! frmDBRegister := TfrmDBRegister.Create(Application); try // show servername --- 126,137 ---- * *****************************************************************} ! ! function RegisterDB(var DBAlias, Username, Password, Role, CharacterSet: string; DatabaseFiles: TStringList; const SelServer: TibcServerNode; var SaveAlias, CaseSensitive: boolean): boolean; + var frmDBRegister: TfrmDBRegister; begin ! frmDBRegister := TfrmDBRegister.Create(Application.MainForm); try // show servername *************** *** 153,156 **** --- 158,164 ---- Password := frmDBRegister.edtPassword.Text; Role := frmDBRegister.edtRole.Text; + + CharacterSet := frmDBRegister.cbCharacterSet.Text; + SaveAlias := frmDBRegister.chkSaveAlias.Checked; CaseSensitive := frmDBRegister.cbCaseSensitive.Checked; *************** *** 273,325 **** *****************************************************************} function TfrmDBRegister.VerifyInputData(): boolean; - var - lRegistry : TRegistry; begin - lRegistry := Nil; result := true; - - try - lRegistry := TRegistry.Create; ! // if no dbalias is specified ! if (edtDBAlias.Text = '') or (edtDBAlias.Text = ' ') then ! begin ! DisplayMsg(ERR_DB_ALIAS,''); // show error message ! edtDBAlias.SetFocus; // give focus to control ! result := false; ! Exit; ! end; ! ! // check for backslash in dbalias ! // If backslashes are used (i.e. for a path), then the registry ! // key will not be created properly ! if Pos('\',edtDBAlias.Text) <> 0 then ! begin ! DisplayMsg(ERR_DB_ALIAS,''); // show error message ! edtDBAlias.SetFocus; // give focus to control ! result := false; ! Exit; ! end; ! ! // if no dbfile is specified ! if (edtDBFile.GetTextLen = 0) then ! begin ! DisplayMsg(ERR_DB_FILE,edtDBFile.Text); // show error message ! edtDBFile.SetFocus; // give focus to control ! result := false; ! Exit; ! end; ! if lRegistry.KeyExists(Format('%s%s\Databases\%s',[gRegServersKey,FCurrSelServer.Nodename,edtDBAlias.Text])) then ! begin // show error message ! DisplayMsg(ERR_DB_ALIAS,'This database alias already exists.'); ! edtDBAlias.SetFocus; // give focus to control ! result := false; ! Exit; ! end; ! finally ! lRegistry.Free; end; end; --- 281,321 ---- *****************************************************************} function TfrmDBRegister.VerifyInputData(): boolean; begin result := true; ! // if no dbalias is specified ! if (edtDBAlias.Text = '') or (edtDBAlias.Text = ' ') then ! begin ! DisplayMsg(ERR_DB_ALIAS,''); // show error message ! edtDBAlias.SetFocus; // give focus to control ! result := false; ! Exit; ! end; ! // check for backslash in dbalias ! // If backslashes are used (i.e. for a path), then the registry ! // key will not be created properly ! if Pos('\',edtDBAlias.Text) <> 0 then ! begin ! DisplayMsg(ERR_DB_ALIAS,''); // show error message ! edtDBAlias.SetFocus; // give focus to control ! result := false; ! Exit; ! end; + // if no dbfile is specified + if (edtDBFile.GetTextLen = 0) then + begin + DisplayMsg(ERR_DB_FILE,edtDBFile.Text); // show error message + edtDBFile.SetFocus; // give focus to control + result := false; + Exit; + end; ! if PersistentInfo.DatabaseAliasExists(FCurrSelServer.NodeName, edtDBAlias.Text) then // kris changed from DBAliasExists to DatabaseAliasExists ! begin // show error message ! DisplayMsg(ERR_DB_ALIAS,'This database alias already exists.'); ! edtDBAlias.SetFocus; // give focus to control ! result := false; end; end; Index: frmuDBRestore.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBRestore.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuDBRestore.pas 2000/09/04 14:18:40 1.2 --- frmuDBRestore.pas 2000/12/04 09:52:50 1.3 *************** *** 15,19 **** * Corporation. All Rights Reserved. * ! * Contributor(s): ______________________________________. } --- 15,19 ---- * Corporation. All Rights Reserved. * ! * Contributor(s): Krzysztof Golko. } *************** *** 100,105 **** implementation ! uses zluGlobal,frmuServerRegister,IBServices,frmuMessage, ! frmuMain, zluUtility, dmuMain, zluContextHelp, Registry, IBErrorCodes; {$R *.DFM} --- 100,105 ---- implementation ! uses zluGlobal, zluPersistent, frmuServerRegister,IBServices,frmuMessage, ! frmuMain, zluUtility, dmuMain, zluContextHelp, IBErrorCodes; {$R *.DFM} *************** *** 199,203 **** lOptions: TRestoreOptions; lVerboseInfo: TStringList; ! Reg: TRegistry; begin if VerifyInputData() then --- 199,203 ---- lOptions: TRestoreOptions; lVerboseInfo: TStringList; ! dbProps: TibcDatabaseProps; begin if VerifyInputData() then *************** *** 306,321 **** { If the database alias entered does not already exist, create it } ! if not frmMain.AliasExists (cbDBAlias.Text) then begin ! Reg := TRegistry.Create; ! if Reg.OpenKey(Format('%s%s\Databases\%s',[gRegServersKey, cbDBServer.Text, cbDBAlias.Text]),true) then ! begin ! Reg.WriteString('DatabaseFiles', lRestoreService.DatabaseName.Text); ! Reg.WriteString('Username', FSourceServerNode.UserName); ! Reg.CloseKey; ! Reg.Free; ! frmMain.tvMainChange(nil, nil); end; - end; ModalResult := mrOK; except --- 306,318 ---- { If the database alias entered does not already exist, create it } ! // kris start ! if not PersistentInfo.DatabaseAliasExists(FSourceServerNode.ServerName, cbDBAlias.Text) then begin ! PersistentInfo.GetDatabaseProps(cbDBServer.Text, cbDBAlias.Text, dbProps); ! dbProps.DatabaseFiles := lRestoreService.DatabaseName.Text; ! dbProps.Username := FSourceServerNode.UserName; ! PersistentInfo.StoreDatabaseProps(cbDBServer.Text, cbDBAlias.Text, dbProps); ! frmMain.tvMainChange(nil, nil); end; ModalResult := mrOK; except *************** *** 830,838 **** lCnt: integer; found: boolean; - fp: string; begin result := true; found := false; // check if combo box is empty or nothing selected --- 827,843 ---- lCnt: integer; found: boolean; begin result := true; found := false; + // check if backup alias combo box is not empty + // problem: how to restore if there's no backup alias + if cbBackupAlias.Text = '' then + begin + DisplayMsg(ERR_BACKUP_ALIAS, ''); + cbBackupAlias.SetFocus; + Result := false; + Exit; + end; // check if combo box is empty or nothing selected *************** *** 857,872 **** begin if (sgDatabaseFiles.Cells[0,lCnt] <> '') then - begin found := true; - fp := ExtractFilePath(sgDatabaseFiles.Cells[0,lCnt]); - - if fp = '' then - begin - DisplayMsg(ERR_NO_PATH, 'File: '+sgDatabaseFiles.Cells[0,lCnt]); - sgDatabaseFiles.SetFocus; - result := false; - exit; - end; - end; end; --- 862,866 ---- *************** *** 918,922 **** lBackupAliasNode := TibcBackupAliasNode(SourceBackupAliasNode); try ! frmDBRestore := TfrmDBRestore.Create(Application); frmDBRestore.FSourceServerNode := SourceServerNode; frmDBRestore.stxBackupServer.Caption := SourceServerNode.NodeName; --- 912,916 ---- lBackupAliasNode := TibcBackupAliasNode(SourceBackupAliasNode); try ! frmDBRestore := TfrmDBRestore.Create(Application.MainForm); frmDBRestore.FSourceServerNode := SourceServerNode; frmDBRestore.stxBackupServer.Caption := SourceServerNode.NodeName; Index: frmuDBShutdown.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBShutdown.pas,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** frmuDBShutdown.pas 2000/08/03 20:15:03 1.1.1.1 --- frmuDBShutdown.pas 2000/12/04 09:52:50 1.2 *************** *** 118,122 **** begin // create form and config service objects ! frmDBShutdown := TfrmDBShutdown.Create(Application); lConfig := TIBConfigService.Create(Nil); lReconnect := False; --- 118,122 ---- begin // create form and config service objects ! frmDBShutdown := TfrmDBShutdown.Create(Application.MainForm); lConfig := TIBConfigService.Create(Nil); lReconnect := False; Index: frmuDBStatistics.pas =================================================================== RCS file: /cvsroot/firebird/ibconsole/frmuDBStatistics.pas,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** frmuDBStatistics.pas 2000/09/04 14:18:40 1.2 --- frmuDBStatistics.pas 2000/12/04 09:52:50 1.3 *************** *** 116,120 **** begin lDBStatisticsData := TStringList.Create(); ! lDBStatistics ... [truncated message content] |
|
From: Patrick J. P. G. <pat...@us...> - 2000-12-04 02:30:10
|
Update of /cvsroot/firebird/interbase/firebird/patrickgriffin/tcs_tests In directory slayer.i.sourceforge.net:/tmp/cvs-serv25708/firebird/patrickgriffin/tcs_tests Added Files: readme Removed Files: bug_112177_01 bug_112177_02 bug_112177_03 bug_112177_04 bug_112177_05 bug_112177_06 bug_112177_07 bug_112177_08 bug_112177_09 bug_112177_10 bug_112177_11 bug_112177_12 bug_116579_01 Log Message: moving files from tree to ftp area. --- NEW FILE --- The files previously stored here have been moved to ftp://firebird.sourceforge.net/pub/firebird/bug_112177/tcs_tests ...pat --- bug_112177_01 DELETED --- --- bug_112177_02 DELETED --- --- bug_112177_03 DELETED --- --- bug_112177_04 DELETED --- --- bug_112177_05 DELETED --- --- bug_112177_06 DELETED --- --- bug_112177_07 DELETED --- --- bug_112177_08 DELETED --- --- bug_112177_09 DELETED --- --- bug_112177_10 DELETED --- --- bug_112177_11 DELETED --- --- bug_112177_12 DELETED --- --- bug_116579_01 DELETED --- |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-12-01 11:20:42
|
Update of /cvsroot/firebird/interbase/builds/original In directory slayer.i.sourceforge.net:/tmp/cvs-serv8360/interbase/builds/original Modified Files: prefix.linux Log Message: Added SHRLIB_EXT to prefix.linux Index: prefix.linux =================================================================== RCS file: /cvsroot/firebird/interbase/builds/original/prefix.linux,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** prefix.linux 2000/09/15 07:19:04 1.5 --- prefix.linux 2000/12/01 11:20:31 1.6 *************** *** 16,20 **** # Contributor(s): ______________________________________. # Start of file prefix.linux: $(VERSION) $(PLATFORM) ! #$Id$ .SUFFIXES: .c .e --- 16,23 ---- # Contributor(s): ______________________________________. # Start of file prefix.linux: $(VERSION) $(PLATFORM) ! #$Log$ ! #Revision 1.6 2000/12/01 11:20:31 fsg ! #Added SHRLIB_EXT to prefix.linux ! # .SUFFIXES: .c .e *************** *** 51,54 **** --- 54,58 ---- UDF_SHRLIBS= -lgds -lm -lc -mieee-fp -ldl -lcrypt + #NOTE: PIC_J_CFLAGS is special CFLAGS used to build PIPD_IS_SHRLIB modules # to workaround the Solaris threading problems with signals *************** *** 163,166 **** --- 167,173 ---- ARCH_EXT= .a EXEC_EXT= + # FSG 1.Dez.2000 + SHRLIB_EXT= .so + V3PRINTER= source/lock/printv3.o |
|
From: Frank Schlottmann-G. <fs...@us...> - 2000-11-30 16:31:57
|
Update of /cvsroot/firebird/interbase In directory slayer.i.sourceforge.net:/tmp/cvs-serv18068/interbase Modified Files: ChangeLog Log Message: Updated ChangeLog Index: ChangeLog =================================================================== RCS file: /cvsroot/firebird/interbase/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** ChangeLog 2000/11/28 15:09:02 1.7 --- ChangeLog 2000/11/30 16:31:51 1.8 *************** *** 1,2 **** --- 1,45 ---- + 2000-11-30 15:27 patrickgriffin + + * interbase/jrd/: dpm.e, ods.h, pag.c, pag.h: + + Bug #116733 Too Many Generators Corrupt Database. + + Change written to the spec.s attached to the bug report. + + Summary: Added pgc_pgp Generators Per Page and used this new + field when calculating page and offset for each generator. + + ...pat + + 2000-11-30 15:23 patrickgriffin + + * interbase/jrd/evl.c: + + * Modified by: Patrick J. P. Griffin + * Date: 11/24/2000 + * Problem: select count(0)+1 from rdb$relations where 0=1; + returns 0 + * In the EVL_group processing, the internal assigment + for + * the literal in the computation is being done on + every + * statement fetch, so if there are no statements + fetched + * then the internal field never gets set. + * Change: Added an assignment process for the literal + * before the first fetch. + + 2000-11-29 12:11 fsg + + * interbase/gpre/form_trn.c: + + Added some more PYXIS datatypes to form_trn.c + + 2000-11-28 16:09 fsg + + * interbase/: pyxis/fred.e, ChangeLog: + + Changed fred.e to go through 6.0 gpre + 2000-11-28 07:47 fsg |
|
From: Patrick J. P. G. <pat...@us...> - 2000-11-30 14:27:46
|
Update of /cvsroot/firebird/interbase/jrd In directory slayer.i.sourceforge.net:/tmp/cvs-serv3505/interbase/jrd Modified Files: dpm.e ods.h pag.c pag.h Log Message: Bug #116733 Too Many Generators Corrupt Database. Change written to the spec.s attached to the bug report. Summary: Added pgc_pgp Generators Per Page and used this new field when calculating page and offset for each generator. ...pat Index: dpm.e =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/dpm.e,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** dpm.e 2000/08/03 20:49:50 1.1.1.1 --- dpm.e 2000/11/30 14:27:32 1.2 *************** *** 22,25 **** --- 22,33 ---- */ + /* + * Modified by: Patrick J. P. Griffin + * Date: 11/29/2000 + * Problem: Bug 116733 Too many generators corrupt database. + * DPM_gen_id was not calculating page and offset correctly. + * Change: Corrected routine to use new variables from PAG_init. + */ + #include "../jrd/ib_stdio.h" #include "../jrd/ibsetjmp.h" *************** *** 1094,1098 **** **************************************/ DBB dbb; ! PPG page; WIN window; VCL vector; --- 1102,1106 ---- **************************************/ DBB dbb; ! GPG page; WIN window; VCL vector; *************** *** 1112,1132 **** #endif ! sequence = generator / dbb->dbb_pcontrol->pgc_ppp; ! offset = generator % dbb->dbb_pcontrol->pgc_ppp; if (!(vector = dbb->dbb_gen_id_pages) || ! sequence >= vector->vcl_count) { DPM_scan_pages (tdbb); if (!(vector = dbb->dbb_gen_id_pages) || ! sequence >= vector->vcl_count) { ! page = (PPG) DPM_allocate (tdbb, &window); ! page->ppg_header.pag_type = pag_ids; ! page->ppg_sequence = sequence; CCH_must_write (&window); CCH_RELEASE (tdbb, &window); DPM_pages (tdbb, 0, pag_ids, (ULONG) sequence, window.win_page); ! vector = (VCL) ALL_vector (dbb->dbb_permanent, &dbb->dbb_gen_id_pages, sequence + 1); vector->vcl_long [sequence] = window.win_page; } --- 1120,1149 ---- #endif ! sequence = generator / dbb->dbb_pcontrol->pgc_gpg; ! offset = generator % dbb->dbb_pcontrol->pgc_gpg; if (!(vector = dbb->dbb_gen_id_pages) || ! (sequence >= vector->vcl_count) || ! !(vector->vcl_long [sequence])) { DPM_scan_pages (tdbb); if (!(vector = dbb->dbb_gen_id_pages) || ! (sequence >= vector->vcl_count) || ! !(vector->vcl_long [sequence])) { ! page = (GPG) DPM_allocate (tdbb, &window); ! page->gpg_header.pag_type = pag_ids; ! page->gpg_sequence = sequence; CCH_must_write (&window); CCH_RELEASE (tdbb, &window); DPM_pages (tdbb, 0, pag_ids, (ULONG) sequence, window.win_page); ! if (!(vector = dbb->dbb_gen_id_pages)) ! { ! vector = dbb->dbb_gen_id_pages = (VCL) ALLOCPV (type_vcl, sequence + 1); ! vector->vcl_count = sequence + 1; ! } ! else ! if (sequence >= vector->vcl_count) ! vector = (VCL) ALL_extend(&dbb->dbb_gen_id_pages, sequence + 1); vector->vcl_long [sequence] = window.win_page; } *************** *** 1137,1145 **** #ifdef READONLY_DATABASE if (dbb->dbb_flags & DBB_read_only) ! page = (PPG) CCH_FETCH (tdbb, &window, LCK_read, pag_ids); else ! page = (PPG) CCH_FETCH (tdbb, &window, LCK_write, pag_ids); #else ! page = (PPG) CCH_FETCH (tdbb, &window, LCK_write, pag_ids); #endif /* READONLY_DATABASE */ --- 1154,1162 ---- #ifdef READONLY_DATABASE if (dbb->dbb_flags & DBB_read_only) ! page = (GPG) CCH_FETCH (tdbb, &window, LCK_read, pag_ids); else ! page = (GPG) CCH_FETCH (tdbb, &window, LCK_write, pag_ids); #else ! page = (GPG) CCH_FETCH (tdbb, &window, LCK_write, pag_ids); #endif /* READONLY_DATABASE */ *************** *** 1152,1158 **** */ if ( dbb->dbb_ods_version >= ODS_VERSION10) ! ptr = ((SINT64 *)(page->ppg_page)) + offset; else ! lptr = ((SLONG *)(page->ppg_page)) + offset; if (val || initialize) --- 1169,1175 ---- */ if ( dbb->dbb_ods_version >= ODS_VERSION10) ! ptr = ((SINT64 *)(page->gpg_values)) + offset; else ! lptr = ((SLONG *)(((PPG) page)->ppg_page)) + offset; if (val || initialize) Index: ods.h =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/ods.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** ods.h 2000/08/03 20:51:01 1.1.1.1 --- ods.h 2000/11/30 14:27:32 1.2 *************** *** 22,25 **** --- 22,34 ---- */ + /* + * Modified by: Patrick J. P. Griffin + * Date: 11/29/2000 + * Problem: Bug 116733 Too many generators corrupt database. + * DPM_gen_id was not calculating page and offset correctly. + * Change: Add typedef struct gpg to properly document the layout + * of the generator page. + */ + #ifndef _JRD_ODS_H_ #define _JRD_ODS_H_ *************** *** 367,370 **** --- 376,392 ---- UCHAR tip_transactions [1]; } *TIP; + + /* Generator Page */ + + typedef struct gpg { + struct pag gpg_header; + SLONG gpg_sequence; /* Sequence number */ + SLONG gpg_waste1; /* overhead carried for backward compatibility */ + USHORT gpg_waste2; /* overhead carried for backward compatibility */ + USHORT gpg_waste3; /* overhead carried for backward compatibility */ + USHORT gpg_waste4; /* overhead carried for backward compatibility */ + USHORT gpg_waste5; /* overhead carried for backward compatibility */ + SINT64 gpg_values [1]; /* Generator vector */ + } *GPG; /* Record header */ Index: pag.c =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/pag.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** pag.c 2000/10/12 02:52:17 1.3 --- pag.c 2000/11/30 14:27:32 1.4 *************** *** 22,25 **** --- 22,34 ---- */ + /* + * Modified by: Patrick J. P. Griffin + * Date: 11/29/2000 + * Problem: Bug 116733 Too many generators corrupt database. + * DPM_gen_id was not calculating page and offset correctly. + * Change: Caculate pgc_gpg, number of generators per page, + * for use in DPM_gen_id. + */ + #include "../jrd/ib_stdio.h" #include <string.h> *************** *** 1192,1195 **** --- 1201,1212 ---- control->pgc_tpt = (dbb->dbb_page_size - OFFSETA (TIP, tip_transactions)) * 4; control->pgc_pip = 1; + /* dbb_ods_version can be 0 when a new database is being created */ + if ((dbb->dbb_ods_version == 0) || (dbb->dbb_ods_version >= ODS_VERSION10)) + control->pgc_gpg = (dbb->dbb_page_size - OFFSETA (GPG, gpg_values)) / sizeof (((GPG)0)->gpg_values); + else + control->pgc_gpg = (dbb->dbb_page_size - OFFSETA (PPG, ppg_page)) / sizeof (((PPG)0)->ppg_page); + + + /* Compute the number of data pages per pointer page. Each data page Index: pag.h =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/pag.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** pag.h 2000/08/03 20:51:07 1.1.1.1 --- pag.h 2000/11/30 14:27:32 1.2 *************** *** 22,25 **** --- 22,35 ---- */ + /* + * Modified by: Patrick J. P. Griffin + * Date: 11/29/2000 + * Problem: Bug 116733 Too many generators corrupt database. + * DPM_gen_id was not calculating page and offset correctly. + * Change: Add pgc_gpg, number of generators per page, + * for use in DPM_gen_id. + */ + + #ifndef _JRD_PAG_H_ #define _JRD_PAG_H_ *************** *** 35,38 **** --- 45,49 ---- int pgc_bytes; /* Number of bytes of bit in PIP */ int pgc_tpt; /* Transactions per TIP */ + int pgc_gpg; /* Generators per generator page */ } *PGC; |
|
From: Patrick J. P. G. <pat...@us...> - 2000-11-30 14:23:54
|
Update of /cvsroot/firebird/interbase/jrd In directory slayer.i.sourceforge.net:/tmp/cvs-serv3230/interbase/jrd Modified Files: evl.c Log Message: * Modified by: Patrick J. P. Griffin * Date: 11/24/2000 * Problem: select count(0)+1 from rdb$relations where 0=1; returns 0 * In the EVL_group processing, the internal assigment for * the literal in the computation is being done on every * statement fetch, so if there are no statements fetched * then the internal field never gets set. * Change: Added an assignment process for the literal * before the first fetch. Index: evl.c =================================================================== RCS file: /cvsroot/firebird/interbase/jrd/evl.c,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** evl.c 2000/08/03 20:50:07 1.1.1.1 --- evl.c 2000/11/30 14:23:44 1.2 *************** *** 22,25 **** --- 22,37 ---- */ + /* + * Modified by: Patrick J. P. Griffin + * Date: 11/24/2000 + * Problem: select count(0)+1 from rdb$relations where 0=1; returns 0 + * In the EVL_group processing, the internal assigment for + * the literal in the computation is being done on every + * statement fetch, so if there are no statements fetched + * then the internal field never gets set. + * Change: Added an assignment process for the literal + * before the first fetch. + */ + #include <string.h> #include "../jrd/jrd.h" *************** *** 1330,1333 **** --- 1342,1349 ---- /* Initialize a sort to reject duplicate values */ init_agg_distinct (tdbb, from); + break; + + case nod_literal: /* pjpg 20001124 */ + EXE_assignment (tdbb, *ptr); break; } |
1363 messages has been excluded from this view by a project administrator.
