Commit 10bec20e authored by unknown's avatar unknown
Browse files

Windows 64bit fixes 

Fixed udf_example, so tests now can also run udf on win.


sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.1-win/sql/udf_example.def
include/config-win.h:
  removed USE_32_BIT_TIME
include/my_time.h:
  Fixed size of my_time for Win64 (should be 64bit)
mysql-test/mysql-test-run.pl:
  Added windows paths for udf_example
sql/CMakeLists.txt:
  Added udf_example.dll
sql/udf_example.c:
  Windows doesn't know about socket.h and friends. Use winsock.h instead
parent ee5ffff9

include/config-win.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ functions */ 
#if defined(_MSC_VER) && _MSC_VER >= 1400

/* Avoid endless warnings about sprintf() etc. being unsafe. */

#define _CRT_SECURE_NO_DEPRECATE 1

#define _USE_32BIT_TIME_T 1          /* force time_t to be 32 bit */

#endif



#include <sys/locking.h>

include/my_time.h

+5 −0
Original line number Diff line number Diff line
@@ -33,7 +33,12 @@ extern uchar days_in_month[]; 
  Portable time_t replacement.

  Should be signed and hold seconds for 1902-2038 range.

*/

#if defined(_WIN64) || defined(WIN64)

/* on Win64 long is still 4 bytes (not 8!) */

typedef LONG64 my_time_t;

#else

typedef long my_time_t;

#endif



#define MY_TIME_T_MAX LONG_MAX

#define MY_TIME_T_MIN LONG_MIN

mysql-test/mysql-test-run.pl

+3 −1
Original line number Diff line number Diff line
@@ -1240,7 +1240,9 @@ sub executable_setup () { 
    $exe_ndbd=           "$glob_basedir/storage/ndb/src/kernel/ndbd";

    $exe_ndb_mgmd=       "$glob_basedir/storage/ndb/src/mgmsrv/ndb_mgmd";

    $lib_udf_example=

      mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so");

      mtr_file_exists("$glob_basedir/sql/.libs/udf_example.so",

                      "$glob_basedir/sql/release/udf_example.dll",

                      "$glob_basedir/sql/debug/udf_example.dll");

  }

  else

  {

sql/CMakeLists.txt

+4 −0
Original line number Diff line number Diff line
@@ -117,3 +117,7 @@ ADD_CUSTOM_COMMAND( 
)



ADD_DEPENDENCIES(mysqld gen_lex_hash)



ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)

ADD_DEPENDENCIES(udf_example strings)

TARGET_LINK_LIBRARIES(udf_example wsock32)

sql/udf_example.c

+4 −0
Original line number Diff line number Diff line
@@ -674,10 +674,14 @@ longlong sequence(UDF_INIT *initid __attribute__((unused)), UDF_ARGS *args, 
**

****************************************************************************/



#ifdef __WIN__

#include <winsock.h>

#else

#include <sys/socket.h>

#include <netinet/in.h>

#include <arpa/inet.h>

#include <netdb.h>

#endif



my_bool lookup_init(UDF_INIT *initid, UDF_ARGS *args, char *message);

void lookup_deinit(UDF_INIT *initid);