diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-05-07 16:59:03 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-05-07 16:59:03 -0400 |
| commit | 3279ee0a1288637a491993fbc07828413f50cbf1 (patch) | |
| tree | d592f581cc69300e881d85f4531fc7c9fe311875 /libmysqld | |
| parent | 0901dbc5835b1a5aac3c871cd1ac4eac22505fec (diff) | |
| parent | 59ae1777e5e5e123baf57e497791a2c2596096da (diff) | |
| download | mariadb-git-3279ee0a1288637a491993fbc07828413f50cbf1.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.h:
Auto merged
support-files/mysql.spec.sh:
Auto merged
sql/Makefile.am:
SCCS merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 1d99971bd97..1b3207bac17 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -45,7 +45,7 @@ libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ noinst_HEADERS = embedded_priv.h emb_qcache.h sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ - ha_ndbcluster.cc \ + ha_ndbcluster.cc ha_ndbcluster_cond.cc \ ha_ndbcluster_binlog.cc ha_partition.cc \ handler.cc sql_handler.cc \ hostname.cc init.cc password.c \ @@ -108,6 +108,9 @@ endif ha_ndbcluster.o:ha_ndbcluster.cc $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< +ha_ndbcluster_cond.o:ha_ndbcluster_cond.cc + $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< + ha_ndbcluster_binlog.o: ha_ndbcluster_binlog.cc $(CXXCOMPILE) @ndbcluster_includes@ $(LM_CFLAGS) -c $< @@ -188,11 +191,11 @@ link_sources: for f in $(sqlsources); do \ rm -f $$f; \ if test -e $(top_srcdir)/sql/$$f ; \ - then \ + then \ @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \ - else \ + else \ @LN_CP_F@ $(top_builddir)/sql/$$f $$f; \ - fi ; \ + fi ; \ done; \ for f in $(libmysqlsources); do \ rm -f $$f; \ |