diff options
| author | unknown <Greg@greg-laptop.> | 2004-02-27 16:51:01 +0100 |
|---|---|---|
| committer | unknown <Greg@greg-laptop.> | 2004-02-27 16:51:01 +0100 |
| commit | 588b8b93104a4ca20f07593815b0d4357d3c9acf (patch) | |
| tree | 228bc78a8c0277a8cf4cc8b7898e0d8648cbf86f | |
| parent | d32e12b253e02ebc13907f00bf6bb5409bba9c1e (diff) | |
| download | mariadb-git-588b8b93104a4ca20f07593815b0d4357d3c9acf.tar.gz | |
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
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | VC++Files/innobase/innobase.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/libmysql/libmysql.dsp | 4 | ||||
| -rw-r--r-- | sql/log_event.cc | 2 | ||||
| -rw-r--r-- | sql/opt_range.cc | 4 |
5 files changed, 8 insertions, 7 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index c51d344aef5..8db23877ee5 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 83419fc53cc..c50911063ab 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 923cac29c37..ed8f27ef579 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 1c10a9a798c..61a1ee24973 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 0ed5c447486..071c83bb6d2 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 |