diff --git a/ChangeLog b/ChangeLog
index bf7535f1c6..1e79c3aa7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,134 @@
+2004-10-03 22:18  skidder
+
+	* firebird2/src/: gpre/int_cxx.cpp (1.38), jrd/blb.cpp (1.91),
+	jrd/blb.h (1.21), jrd/dfw.epp (1.130), jrd/tra.h (1.40):
+	
+	Roll back implementation of Claudio suggestion for consturctor of
+	BID structure. It forced addition of constructors for message
+	structures generated by GPRE which is not correct
+
+2004-10-03 22:14  skidder
+
+	* firebird2/src/lock/print.cpp (1.44):
+	
+	Use MSVC6 variant of code everywhere to avoid excess conditionals
+
+2004-10-03 14:36  dimitr
+
+	* firebird2/src/jrd/err.cpp (1.57):
+	
+	Minor correction.
+
+2004-10-03 14:16  dimitr
+
+	* firebird2/src/jrd/cch.cpp (1.111):
+	
+	Some checks as suggested by Claudio.
+
+2004-10-03 14:10  dimitr
+
+	* firebird2/src/jrd/: evl.cpp (1.108), exe.cpp (1.123):
+	
+	Added more points to reschedule.
+
+2004-10-03 13:38  dimitr
+
+	* firebird2/src/dsql/: dsql.tab.h (1.42), parse.cpp (1.126),
+	parse.y (1.149):
+	
+	Fixed AV in the parser.
+
+2004-10-03 11:48  robocop
+
+	* firebird2/src/jrd/isc_f_proto.h (1.15):
+	
+	Shortly after I committed, I noticed that ISC_strip_filename() is
+	only declared but not defined anywhere. Deleted it.
+
+2004-10-03 11:44  robocop
+
+	* firebird2/src/jrd/isc_f_proto.h (1.14):
+	
+	Fix assertion in fb_string has agreed with Alex: in the caller
+	function.
+
+2004-10-03 11:31  robocop
+
+	* firebird2/src/jrd/gds.cpp (1.148):
+	
+	Fix mistake in operator until I'm ready to commit our utility
+	snprintf.
+
+2004-10-03 09:06  robocop
+
+	* firebird2/src/lock/reset.cpp (1.3):
+	
+	Little program made more correct.
+
+2004-10-03 09:04  robocop
+
+	* firebird2/src/remote/: remote.h (1.42), os/win32/ibconfig.cpp
+	(1.10), os/win32/property.cpp (1.10), os/win32/window.cpp (1.11):
+	
+	ipserver is being deleted. Update source files.
+
+2004-10-03 08:33  robocop
+
+	* firebird2/: builds/win32/msvc6/ipserver.dsp (1.15),
+	src/ipserver/alli.cpp (1.6), src/ipserver/alli_proto.h (1.4),
+	src/ipserver/blk.h (1.2), src/ipserver/ipapi_proto.h (1.12),
+	src/ipserver/ipc.h (1.25), src/ipserver/ipcevent.cpp (1.4),
+	src/ipserver/ipcli_proto.h (1.4), src/ipserver/ipclient.cpp (1.50),
+	src/ipserver/ipevt_proto.h (1.4), src/ipserver/ips.h (1.4),
+	src/ipserver/ipserver.cpp (1.45), src/ipserver/ipsrv_proto.h (1.4):
+	
+	ipserver is being deleted. Update build files.
+
+2004-10-03 08:29  robocop
+
+	* firebird2/builds/: mac_os_x/CS/CS.pbproj/project.pbxproj (1.10),
+	posix/prefix.mingw (1.32), win32/msvc6/fbclient_static.dsp (1.17):
+	
+	ipserver is being deleted. Update build files.
+
+2004-10-03 06:48  robocop
+
+	* firebird2/src/: dsql/ddl.cpp (1.115), dsql/dsql.cpp (1.126),
+	dsql/dsql.tab.h (1.41), dsql/keywords.cpp (1.33), dsql/node.h
+	(1.46), dsql/parse.cpp (1.125), dsql/parse.y (1.148), dudley/ddl.h
+	(1.30), dudley/exe.epp (1.53), dudley/extract.epp (1.37),
+	dudley/hsh.cpp (1.15), dudley/parse.cpp (1.45), dudley/parse.h
+	(1.8), gpre/cmd.cpp (1.38), gpre/pretty.cpp (1.29),
+	isql/extract.epp (1.43), isql/isql.h (1.37), isql/show.epp (1.58),
+	jrd/RecordNumber.h (1.3), jrd/cch.cpp (1.110), jrd/cch.h (1.26),
+	jrd/dmp.cpp (1.28), jrd/dyn_def.epp (1.78), jrd/dyn_df_proto.h
+	(1.10), jrd/dyn_mod.epp (1.53), jrd/flags.h (1.5), jrd/ibase.h
+	(1.89), jrd/jrd.h (1.116), jrd/ods.h (1.31), jrd/pag.cpp (1.82),
+	jrd/pag_proto.h (1.13), jrd/tra.h (1.39), jrd/os/vms/vms.cpp
+	(1.20), utilities/gstat/ppg.cpp (1.21),
+	utilities/rebuild/rebuild.cpp (1.16):
+	
+	After talking to Ann, decided to disable several items: - obsolete
+	items like WAL and JOURNAL (cleaned in the past) - crud from
+	attempts never finished like the shared cache manager for Classic -
+	DSQL nodes that aren't used. This allowed freeing some keywords. 
+	The functionality was disabled by commenting the code. No code has
+	been deleted.
+
+2004-10-03 06:44  robocop
+
+	* firebird2/src/lock/print.cpp (1.43):
+	
+	MSVC6 doesn't know how to convert UINT64 to double.
+
+2004-10-03 06:43  robocop
+
+	* firebird2/src/gpre/: c_cxx.cpp (1.54), int_cxx.cpp (1.37):
+	
+	Let's gpre be more CPP friendly when defining ports (at least with
+	MSVC6) Ref: object with constructor inside struct should have that
+	struct given a type name.
+
 2004-10-02 11:33  robocop
 
 	* firebird2/src/: jrd/RecordNumber.h (1.2), common/classes/tree.h