Commit 0c5d3627 authored by unknown's avatar unknown
Browse files

Fix for bug #19121: Windows incompatible udf_example 


mysql-test/mysql-test-run.pl:
  fixed path for udf_example.so when running testsuite on Windows
sql/CMakeLists.txt:
  Added missing udf_example
sql/Makefile.am:
  Added udf_example files for make dist
sql/udf_example.c:
  fix for Windows: Windows doesn't have socket.h and friends
  
  Added replacements for strmov,bzero and memcpy_fixed when compiling standalone.
sql/udf_example.def:
  BitKeeper file /home/georg/work/mysql/prod/mysql-5.0-win/sql/udf_example.def
parent fcd21bd4

BitKeeper/etc/collapsed

+1 −0
Original line number Diff line number Diff line
@@ -2,3 +2,4 @@ 
44ec850ac2k4y2Omgr92GiWPBAVKGQ

44edb86b1iE5knJ97MbliK_3lCiAXA

44f33f3aj5KW5qweQeekY1LU0E9ZCg

4513d8e4Af4dQWuk13sArwofRgFDQw

mysql-test/mysql-test-run.pl

+3 −1
Original line number Diff line number Diff line
@@ -1110,7 +1110,9 @@ sub executable_setup () { 
    $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/ndb/tools");

    $exe_ndb_mgm=        "$glob_basedir/ndb/src/mgmclient/ndb_mgm";

    $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 −1
Original line number Diff line number Diff line
@@ -110,5 +110,8 @@ ADD_CUSTOM_COMMAND( 
	COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h

	DEPENDS ${GEN_LEX_HASH_EXE}

)



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/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -117,7 +117,8 @@ DEFS = -DMYSQL_SERVER \ 


BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h

EXTRA_DIST =		$(BUILT_SOURCES) nt_servc.cc nt_servc.h \

			message.mc examples/CMakeLists.txt CMakeLists.txt

			message.mc examples/CMakeLists.txt CMakeLists.txt \

			udf_example.c udf_example.def

DISTCLEANFILES =        lex_hash.h sql_yacc.output



AM_YFLAGS =		-d --debug --verbose

sql/udf_example.c

+11 −0
Original line number Diff line number Diff line
@@ -127,7 +127,14 @@ typedef long long longlong; 
#else

#include <my_global.h>

#include <my_sys.h>

#if defined(MYSQL_SERVER)

#include <m_string.h>		/* To get strmov() */

#else

/* when compiled as standalone */

#define strmov(a,b) strcpy(a,b)

#define bzero(a,b) memset(a,0,b)

#define memcpy_fixed(a,b,c) memcpy(a,b,c)

#endif

#endif

#include <mysql.h>

#include <ctype.h>
@@ -674,10 +681,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);