mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
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
This commit is contained in:
unknown 2006-09-23 07:54:40 +02:00
commit d339895f9a
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BitKeeper/etc/collapsed
View file

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

3
sql/Makefile.am
View file

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

7
sql/udf_example.c
View file

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