Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge

into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge

BitKeeper/etc/collapsed

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

sql/Makefile.am

@@ -122,7 +122,8 @@ DEFS =			-DMYSQL_SERVER \
 
 BUILT_SOURCES =		sql_yacc.cc sql_yacc.h lex_hash.h
 EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_SOURCES) \
-			nt_servc.cc nt_servc.h message.mc CMakeLists.txt
+			nt_servc.cc nt_servc.h message.mc CMakeLists.txt \
+			udf_example.c udf_example.def
 CLEANFILES =        	lex_hash.h sql_yacc.cc sql_yacc.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>