diff --git a/sql/src/f_btree.h b/sql/src/f_btree.h
index 066c0bb..f584df5 100644
--- a/sql/src/f_btree.h
+++ b/sql/src/f_btree.h
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: f_btree.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef F_BTREE_H
diff --git a/sql/src/f_nici.cpp b/sql/src/f_nici.cpp
index 2b2687f..df440f3 100644
--- a/sql/src/f_nici.cpp
+++ b/sql/src/f_nici.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: f_nici.cpp 3111 2006-01-19 13:10:50 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/f_nici.h b/sql/src/f_nici.h
index e23c555..841ce35 100644
--- a/sql/src/f_nici.h
+++ b/sql/src/f_nici.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: f_nici.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef	_F_NICI_HPP
diff --git a/sql/src/fbtrset.cpp b/sql/src/fbtrset.cpp
index c43a6f2..5238e24 100644
--- a/sql/src/fbtrset.cpp
+++ b/sql/src/fbtrset.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fbtrset.cpp 3111 2006-01-19 13:10:50 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fbtrset.h b/sql/src/fbtrset.h
index 22c90c2..a6c80ca 100644
--- a/sql/src/fbtrset.h
+++ b/sql/src/fbtrset.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fbtrset.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef BTRSET_H
diff --git a/sql/src/fcache.h b/sql/src/fcache.h
index 940f7e5..9fe4121 100644
--- a/sql/src/fcache.h
+++ b/sql/src/fcache.h
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fcache.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FCACHE_H
diff --git a/sql/src/fcollate.cpp b/sql/src/fcollate.cpp
index 10f63d5..f950227 100644
--- a/sql/src/fcollate.cpp
+++ b/sql/src/fcollate.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fcollate.cpp 3111 2006-01-19 13:10:50 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fcollate.h b/sql/src/fcollate.h
index 8df0750..9f38449 100644
--- a/sql/src/fcollate.h
+++ b/sql/src/fcollate.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fcollate.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FCOLLATE_H
diff --git a/sql/src/fdbcnfig.cpp b/sql/src/fdbcnfig.cpp
index 14cfd49..cea2344 100644
--- a/sql/src/fdbcnfig.cpp
+++ b/sql/src/fdbcnfig.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdbcnfig.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdbcopy.cpp b/sql/src/fdbcopy.cpp
index 0735756..db2448f 100644
--- a/sql/src/fdbcopy.cpp
+++ b/sql/src/fdbcopy.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdbcopy.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdbremov.cpp b/sql/src/fdbremov.cpp
index ac508cc..4398966 100644
--- a/sql/src/fdbremov.cpp
+++ b/sql/src/fdbremov.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdbremov.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdbrenam.cpp b/sql/src/fdbrenam.cpp
index 2d0ff7f..ce869e6 100644
--- a/sql/src/fdbrenam.cpp
+++ b/sql/src/fdbrenam.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdbrenam.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdict.h b/sql/src/fdict.h
index 9391466..2adc4f3 100644
--- a/sql/src/fdict.h
+++ b/sql/src/fdict.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdict.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FDICT_H
diff --git a/sql/src/fdllmain.cpp b/sql/src/fdllmain.cpp
index baa28c7..cf9f601 100644
--- a/sql/src/fdllmain.cpp
+++ b/sql/src/fdllmain.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdllmain.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdynbtre.cpp b/sql/src/fdynbtre.cpp
index 6539f1c..46cfc17 100644
--- a/sql/src/fdynbtre.cpp
+++ b/sql/src/fdynbtre.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdynbtre.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdynbuf.cpp b/sql/src/fdynbuf.cpp
index ae5a6d0..8e021a5 100644
--- a/sql/src/fdynbuf.cpp
+++ b/sql/src/fdynbuf.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdynbuf.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdynbuf.h b/sql/src/fdynbuf.h
index e71ea96..eefed1e 100644
--- a/sql/src/fdynbuf.h
+++ b/sql/src/fdynbuf.h
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdynbuf.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 /****************************************************************************
diff --git a/sql/src/fdynsset.cpp b/sql/src/fdynsset.cpp
index d0c3a35..3e5d4da 100644
--- a/sql/src/fdynsset.cpp
+++ b/sql/src/fdynsset.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdynsset.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fdynsset.h b/sql/src/fdynsset.h
index 5b58ad3..c50f98f 100644
--- a/sql/src/fdynsset.h
+++ b/sql/src/fdynsset.h
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fdynsset.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FDYNSSET_H
diff --git a/sql/src/ffilehdr.cpp b/sql/src/ffilehdr.cpp
index 2bb481e..a167c56 100644
--- a/sql/src/ffilehdr.cpp
+++ b/sql/src/ffilehdr.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: ffilehdr.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/filesys.h b/sql/src/filesys.h
index 217eec2..749cfa1 100644
--- a/sql/src/filesys.h
+++ b/sql/src/filesys.h
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: filesys.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FILESYS_H
diff --git a/sql/src/flbackup.cpp b/sql/src/flbackup.cpp
index ab73db5..0f06033 100644
--- a/sql/src/flbackup.cpp
+++ b/sql/src/flbackup.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flbackup.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flclose.cpp b/sql/src/flclose.cpp
index fbfa749..c759678 100644
--- a/sql/src/flclose.cpp
+++ b/sql/src/flclose.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flclose.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flconvrt.cpp b/sql/src/flconvrt.cpp
index 8d2ee40..8b8e069 100644
--- a/sql/src/flconvrt.cpp
+++ b/sql/src/flconvrt.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flconvrt.cpp 3112 2006-01-19 13:12:40 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flcreate.cpp b/sql/src/flcreate.cpp
index 11402f7..8bec2ee 100644
--- a/sql/src/flcreate.cpp
+++ b/sql/src/flcreate.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flcreate.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fldbglog.cpp b/sql/src/fldbglog.cpp
index 4893fe7..586c1ff 100644
--- a/sql/src/fldbglog.cpp
+++ b/sql/src/fldbglog.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fldbglog.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flerror.cpp b/sql/src/flerror.cpp
index d20217c..927943d 100644
--- a/sql/src/flerror.cpp
+++ b/sql/src/flerror.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flerror.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flgethdr.cpp b/sql/src/flgethdr.cpp
index 9a29b23..aecede6 100644
--- a/sql/src/flgethdr.cpp
+++ b/sql/src/flgethdr.cpp
@@ -22,7 +22,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flgethdr.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flindex.cpp b/sql/src/flindex.cpp
index fcca1a1..f55c410 100644
--- a/sql/src/flindex.cpp
+++ b/sql/src/flindex.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flindex.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flkeyret.cpp b/sql/src/flkeyret.cpp
index ba044d6..8cfabc3 100644
--- a/sql/src/flkeyret.cpp
+++ b/sql/src/flkeyret.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flkeyret.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flmstat.cpp b/sql/src/flmstat.cpp
index 4dc1cbf..4c3af86 100644
--- a/sql/src/flmstat.cpp
+++ b/sql/src/flmstat.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flmstat.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flmstat.h b/sql/src/flmstat.h
index 90255f8..9e400ef 100644
--- a/sql/src/flmstat.h
+++ b/sql/src/flmstat.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flmstat.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FLMSTAT_H
diff --git a/sql/src/flog.cpp b/sql/src/flog.cpp
index 60db788..5bb559a 100644
--- a/sql/src/flog.cpp
+++ b/sql/src/flog.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flog.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flog.h b/sql/src/flog.h
index db9694e..dcffd67 100644
--- a/sql/src/flog.h
+++ b/sql/src/flog.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flog.h 3108 2006-01-19 13:05:19 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FLOG_H
diff --git a/sql/src/flopen.cpp b/sql/src/flopen.cpp
index e44a638..663cd6e 100644
--- a/sql/src/flopen.cpp
+++ b/sql/src/flopen.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flopen.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/flreduce.cpp b/sql/src/flreduce.cpp
index b6b9b9b..6c1f722 100644
--- a/sql/src/flreduce.cpp
+++ b/sql/src/flreduce.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: flreduce.cpp 3113 2006-01-19 13:20:35 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fltrabrt.cpp b/sql/src/fltrabrt.cpp
index b068189..d2819bb 100644
--- a/sql/src/fltrabrt.cpp
+++ b/sql/src/fltrabrt.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fltrabrt.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fltrbeg.cpp b/sql/src/fltrbeg.cpp
index 0029786..4578563 100644
--- a/sql/src/fltrbeg.cpp
+++ b/sql/src/fltrbeg.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fltrbeg.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fltrcmit.cpp b/sql/src/fltrcmit.cpp
index 90e7f40..f3d8366 100644
--- a/sql/src/fltrcmit.cpp
+++ b/sql/src/fltrcmit.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fltrcmit.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fnumber.cpp b/sql/src/fnumber.cpp
index 2d66689..85bbe65 100644
--- a/sql/src/fnumber.cpp
+++ b/sql/src/fnumber.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fnumber.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #define DEFINE_NUMBER_MAXIMUMS
diff --git a/sql/src/frestore.cpp b/sql/src/frestore.cpp
index cc564dd..41004b3 100644
--- a/sql/src/frestore.cpp
+++ b/sql/src/frestore.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: frestore.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fsblk_u.cpp b/sql/src/fsblk_u.cpp
index 80dcd29..4dcf733 100644
--- a/sql/src/fsblk_u.cpp
+++ b/sql/src/fsblk_u.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fsblk_u.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fscursor.cpp b/sql/src/fscursor.cpp
index b02f918..6d35178 100644
--- a/sql/src/fscursor.cpp
+++ b/sql/src/fscursor.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fscursor.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fscursor.h b/sql/src/fscursor.h
index d24289c..0b853e1 100644
--- a/sql/src/fscursor.h
+++ b/sql/src/fscursor.h
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fscursor.h 3109 2006-01-19 13:07:07 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FSCURSOR_H
diff --git a/sql/src/fslfile.cpp b/sql/src/fslfile.cpp
index e6a6977..ffc882c 100644
--- a/sql/src/fslfile.cpp
+++ b/sql/src/fslfile.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fslfile.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fslfileu.cpp b/sql/src/fslfileu.cpp
index 033a0a7..9ad64cb 100644
--- a/sql/src/fslfileu.cpp
+++ b/sql/src/fslfileu.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fslfileu.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fsrefupd.cpp b/sql/src/fsrefupd.cpp
index 5a32abf..3aff7c8 100644
--- a/sql/src/fsrefupd.cpp
+++ b/sql/src/fsrefupd.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fsrefupd.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fsrvlock.cpp b/sql/src/fsrvlock.cpp
index edef7d1..15c70e3 100644
--- a/sql/src/fsrvlock.cpp
+++ b/sql/src/fsrvlock.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fsrvlock.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fsrvlock.h b/sql/src/fsrvlock.h
index 05e4f8e..bdbd69a 100644
--- a/sql/src/fsrvlock.h
+++ b/sql/src/fsrvlock.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fsrvlock.h 3109 2006-01-19 13:07:07 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FSRVLOCK_H
diff --git a/sql/src/fsuperfl.cpp b/sql/src/fsuperfl.cpp
index 8ce3375..a1bd1ef 100644
--- a/sql/src/fsuperfl.cpp
+++ b/sql/src/fsuperfl.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fsuperfl.cpp 3114 2006-01-19 13:22:45 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/fsuperfl.h b/sql/src/fsuperfl.h
index afac08a..250ef25 100644
--- a/sql/src/fsuperfl.h
+++ b/sql/src/fsuperfl.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fsuperfl.h 3109 2006-01-19 13:07:07 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef FSUPERFL_H
diff --git a/sql/src/fsysdata.cpp b/sql/src/fsysdata.cpp
index 897190c..0023b6f 100644
--- a/sql/src/fsysdata.cpp
+++ b/sql/src/fsysdata.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fsysdata.cpp 3123 2006-01-24 17:19:50 -0700 (Tue, 24 Jan 2006) ahodgkinson $
+// $Id$
 //------------------------------------------------------------------------------
 
 #define ALLOCATE_SYS_DATA
diff --git a/sql/src/funicode.cpp b/sql/src/funicode.cpp
index 8b91805..e56ef19 100644
--- a/sql/src/funicode.cpp
+++ b/sql/src/funicode.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: funicode.cpp 3115 2006-01-19 13:24:39 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 //#define DEF_FLM_UNI_GLOBALS
diff --git a/sql/src/fvector.cpp b/sql/src/fvector.cpp
index fdaa50e..0084329 100644
--- a/sql/src/fvector.cpp
+++ b/sql/src/fvector.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: fvector.cpp 3115 2006-01-19 13:24:39 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/kycollat.cpp b/sql/src/kycollat.cpp
index 6c3e10a..db73a7d 100644
--- a/sql/src/kycollat.cpp
+++ b/sql/src/kycollat.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: kycollat.cpp 3115 2006-01-19 13:24:39 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/kyeword.cpp b/sql/src/kyeword.cpp
index de40cd0..ddcc2e8 100644
--- a/sql/src/kyeword.cpp
+++ b/sql/src/kyeword.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: kyeword.cpp 3115 2006-01-19 13:24:39 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/kyqsort.cpp b/sql/src/kyqsort.cpp
index 8cbbf27..927b637 100644
--- a/sql/src/kyqsort.cpp
+++ b/sql/src/kyqsort.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: kyqsort.cpp 3115 2006-01-19 13:24:39 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/kyunlock.cpp b/sql/src/kyunlock.cpp
index 3a8da17..c5ad363 100644
--- a/sql/src/kyunlock.cpp
+++ b/sql/src/kyunlock.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: kyunlock.cpp 3115 2006-01-19 13:24:39 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/recover.cpp b/sql/src/recover.cpp
index 691c2d9..bd3ca2c 100644
--- a/sql/src/recover.cpp
+++ b/sql/src/recover.cpp
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: recover.cpp 3116 2006-01-19 13:31:53 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/rfl.cpp b/sql/src/rfl.cpp
index cea2887..e08448b 100644
--- a/sql/src/rfl.cpp
+++ b/sql/src/rfl.cpp
@@ -19,7 +19,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: rfl.cpp 3116 2006-01-19 13:31:53 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/rfl.h b/sql/src/rfl.h
index 572f414..d9a9c59 100644
--- a/sql/src/rfl.h
+++ b/sql/src/rfl.h
@@ -21,7 +21,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: rfl.h 3109 2006-01-19 13:07:07 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #ifndef RFL_H
diff --git a/sql/src/scache.cpp b/sql/src/scache.cpp
index 317fc41..7179770 100644
--- a/sql/src/scache.cpp
+++ b/sql/src/scache.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: scache.cpp 3116 2006-01-19 13:31:53 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"
diff --git a/sql/src/translog.cpp b/sql/src/translog.cpp
index 9453363..d959ac1 100644
--- a/sql/src/translog.cpp
+++ b/sql/src/translog.cpp
@@ -20,7 +20,7 @@
 //		To contact Novell about this file by physical or electronic mail,
 //		you may find current contact information at www.novell.com
 //
-// $Id: translog.cpp 3116 2006-01-19 13:31:53 -0700 (Thu, 19 Jan 2006) dsanders $
+// $Id$
 //------------------------------------------------------------------------------
 
 #include "flaimsys.h"