Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  shellback.(none):/home/msvensson/mysql/mysql-5.0

BitKeeper/etc/collapsed

@@ -2,3 +2,4 @@
 44ec850ac2k4y2Omgr92GiWPBAVKGQ
 44edb86b1iE5knJ97MbliK_3lCiAXA
 44f33f3aj5KW5qweQeekY1LU0E9ZCg
+4513d8e4Af4dQWuk13sArwofRgFDQw

Docs/manual.chm

+
+*********************************************************
+
+This is a dummy placeholder file for "manual.chm" in the
+MySQL source trees.
+
+Note, that the documentation has been moved into a separate
+BitKeeper source tree named "mysqldoc" - do not attempt to edit this
+file! All changes to it should be done in the mysqldoc tree.
+
+This dummy file is being replaced with the actual file from the
+mysqldoc tree when building the official source distribution.
+
+*********************************************************

client/CMakeLists.txt

@@ -66,6 +66,9 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlclient mysys dbug yassl taocrypt zlib wsock
 ADD_EXECUTABLE(mysqlimport mysqlimport.c)
 TARGET_LINK_LIBRARIES(mysqlimport mysqlclient mysys dbug yassl taocrypt zlib wsock32)
 
+ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c)
+TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient mysys dbug yassl taocrypt zlib wsock32)
+
 ADD_EXECUTABLE(mysqlshow mysqlshow.c)
 TARGET_LINK_LIBRARIES(mysqlshow mysqlclient mysys dbug yassl taocrypt zlib wsock32)
 

mysql-test/mysql-test-run.pl

@@ -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

@@ -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

@@ -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

@@ -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);

sql/udf_example.def

+LIBRARY		udf_example
+DESCRIPTION	'MySQL Sample for UDF'
+VERSION		1.0
+EXPORTS
+  lookup
+  lookup_init
+  reverse_lookup
+  reverse_lookup_init
+  metaphon_init
+  metaphon_deinit
+  metaphon
+  myfunc_double_init
+  myfunc_double
+  myfunc_int_init
+  myfunc_int
+  sequence_init
+  sequence_deinit
+  sequence
+  avgcost_init
+  avgcost_deinit
+  avgcost_reset
+  avgcost_add
+  avgcost_clear
+  avgcost