diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index c51d344aef5e8a7ce195ab5347d2622837b2b62e..8db23877ee58471e3547e22b75b1e7f016d12457 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -2,6 +2,7 @@ Administrador@light.
 Administrator@co3064164-a.
 Administrator@co3064164-a.rochd1.qld.optushome.com.au
 Administrator@fred.
+Greg@greg-laptop.
 Miguel@light.local
 Sinisa@sinisa.nasamreza.org
 ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
diff --git a/VC++Files/innobase/innobase.dsp b/VC++Files/innobase/innobase.dsp
index 83419fc53cc9087ff8e431e63f5b43b24b975400..c50911063ab2295399b124f7515efdbce90ea960 100644
--- a/VC++Files/innobase/innobase.dsp
+++ b/VC++Files/innobase/innobase.dsp
@@ -280,10 +280,6 @@ SOURCE=.\mtr\mtr0mtr.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\odbc\odbc0odbc.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\os\os0file.c
 # End Source File
 # Begin Source File
diff --git a/VC++Files/libmysql/libmysql.dsp b/VC++Files/libmysql/libmysql.dsp
index 923cac29c370cd99dc216d3e9acf4742f718f5eb..ed8f27ef57926825b4d0f27a511c7864149ba9c4 100644
--- a/VC++Files/libmysql/libmysql.dsp
+++ b/VC++Files/libmysql/libmysql.dsp
@@ -463,6 +463,10 @@ SOURCE=..\strings\strxmov.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\strings\strxnmov.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\mysys\thr_mutex.c
 # End Source File
 # Begin Source File
diff --git a/sql/log_event.cc b/sql/log_event.cc
index 1c10a9a798c9d99b11bd7defd0fec0ec29f4a374..61a1ee2497344444d2ca8237233506a5b7788dfb 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1556,7 +1556,7 @@ Create_file_log_event::Create_file_log_event(const char* buf, int len,
     We must make copy of 'buf' as this event may have to live over a
     rotate log entry when used in mysqlbinlog
   */
-  if (!(event_buf= my_memdup(buf, len, MYF(MY_WME))) ||
+  if (!(event_buf= my_memdup((byte*) buf, len, MYF(MY_WME))) ||
       (copy_log_event(event_buf, len, old_format)))
     DBUG_VOID_RETURN;
 
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 0ed5c447486ff986f0f094f7ec3d57ebfb53c97b..071c83bb6d2c772e5d2ff6e7a36789e37437a4c0 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -2414,9 +2414,9 @@ get_quick_keys(PARAM *param,QUICK_SELECT *quick,KEY_PART *key,
   }
 
   /* Get range for retrieving rows in QUICK_SELECT::get_next */
-  if (!(range= new QUICK_RANGE(param->min_key,
+  if (!(range= new QUICK_RANGE((const char *) param->min_key,
 			       (uint) (tmp_min_key - param->min_key),
-			       param->max_key,
+			       (const char *) param->max_key,
 			       (uint) (tmp_max_key - param->max_key),
 			       flag)))
     return 1;			// out of memory