diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2006-09-23 09:48:43 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2006-09-23 09:48:43 -0400 |
| commit | 7732a5901f8faede18132be2417579a7072ec735 (patch) | |
| tree | 925838ffbe750c1c8dbeb33a36a1640027b07a4d /sql/Makefile.am | |
| parent | d3269f883055564d21dc13640eca7a164d231b15 (diff) | |
| parent | f3172a8957e5c2edde1a5dedb94cd293609933df (diff) | |
| download | mariadb-git-7732a5901f8faede18132be2417579a7072ec735.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
mysql-test/mysql-test-run.pl:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 45f87621e07..d9cea960915 100644 --- a/sql/Makefile.am +++ b/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 |