diff options
| author | unknown <lars/lthalmann@dl145k.mysql.com> | 2006-09-23 07:54:40 +0200 |
|---|---|---|
| committer | unknown <lars/lthalmann@dl145k.mysql.com> | 2006-09-23 07:54:40 +0200 |
| commit | d339895f9a8a2d4981ab572eb8cbdf90f192922d (patch) | |
| tree | 12f9cc4c0b474d36b65065d66e5b6be75e8532fe /sql | |
| parent | 3bd9004441c7624a30a2323f53482258bb21b7e0 (diff) | |
| parent | f3172a8957e5c2edde1a5dedb94cd293609933df (diff) | |
| download | mariadb-git-d339895f9a8a2d4981ab572eb8cbdf90f192922d.tar.gz | |
Merge mysql.com:/users/lthalmann/bk/MERGE/mysql-5.0-merge
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
BitKeeper/etc/ignore:
auto-union
mysql-test/r/myisam.result:
Auto merged
mysql-test/t/myisam.test:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/udf_example.c:
Auto merged
BitKeeper/deleted/.del-udf_example.def:
Delete: sql/udf_example.def
mysql-test/mysql-test-run.pl:
Manual merge 5.0->5.1
sql/Makefile.am:
Manual merge 5.0->5.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Makefile.am | 3 | ||||
| -rw-r--r-- | sql/udf_example.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 5600222ed96..502d2881eb0 100644 --- a/sql/Makefile.am +++ b/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 diff --git a/sql/udf_example.c b/sql/udf_example.c index b2e0ad923d5..2fa7474eb16 100644 --- a/sql/udf_example.c +++ b/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> |