Commit 588b8b93 authored by unknown's avatar unknown

Changes to fix errors encountered in test builds on Windows.


VC++Files/innobase/innobase.dsp:
  odbc0odbc.c was removed from the tree.
VC++Files/libmysql/libmysql.dsp:
  strxnmov.c is needed in this module.
sql/log_event.cc:
  Cast required to resolve compile error on Windows - byte * is 
  not equivalent to char *.
sql/opt_range.cc:
  Cast to const char * required to resolve compile error on Windows.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parent d32e12b2
...@@ -2,6 +2,7 @@ Administrador@light. ...@@ -2,6 +2,7 @@ Administrador@light.
Administrator@co3064164-a. Administrator@co3064164-a.
Administrator@co3064164-a.rochd1.qld.optushome.com.au Administrator@co3064164-a.rochd1.qld.optushome.com.au
Administrator@fred. Administrator@fred.
Greg@greg-laptop.
Miguel@light.local Miguel@light.local
Sinisa@sinisa.nasamreza.org Sinisa@sinisa.nasamreza.org
ahlentz@co3064164-a.rochd1.qld.optusnet.com.au ahlentz@co3064164-a.rochd1.qld.optusnet.com.au
......
...@@ -280,10 +280,6 @@ SOURCE=.\mtr\mtr0mtr.c ...@@ -280,10 +280,6 @@ SOURCE=.\mtr\mtr0mtr.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\odbc\odbc0odbc.c
# End Source File
# Begin Source File
SOURCE=.\os\os0file.c SOURCE=.\os\os0file.c
# End Source File # End Source File
# Begin Source File # Begin Source File
......
...@@ -463,6 +463,10 @@ SOURCE=..\strings\strxmov.c ...@@ -463,6 +463,10 @@ SOURCE=..\strings\strxmov.c
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=..\strings\strxnmov.c
# End Source File
# Begin Source File
SOURCE=..\mysys\thr_mutex.c SOURCE=..\mysys\thr_mutex.c
# End Source File # End Source File
# Begin Source File # Begin Source File
......
...@@ -1556,7 +1556,7 @@ Create_file_log_event::Create_file_log_event(const char* buf, int len, ...@@ -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 We must make copy of 'buf' as this event may have to live over a
rotate log entry when used in mysqlbinlog 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))) (copy_log_event(event_buf, len, old_format)))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
......
...@@ -2414,9 +2414,9 @@ get_quick_keys(PARAM *param,QUICK_SELECT *quick,KEY_PART *key, ...@@ -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 */ /* 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), (uint) (tmp_min_key - param->min_key),
param->max_key, (const char *) param->max_key,
(uint) (tmp_max_key - param->max_key), (uint) (tmp_max_key - param->max_key),
flag))) flag)))
return 1; // out of memory return 1; // out of memory
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment