diff options
| author | unknown <hf@deer.(none)> | 2003-06-03 15:03:29 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2003-06-03 15:03:29 +0500 |
| commit | f178aa987f8820bef21663ed8eebe68966b4ec66 (patch) | |
| tree | 3becddf3ec319276ea579a3cc30274bf554fce33 /sql/Makefile.am | |
| parent | aed6de39b6129d84f091e23b4a8b0f5cc8e6076d (diff) | |
| parent | 4beedd513eecdc4f57715112c1496e976a2f079c (diff) | |
| download | mariadb-git-f178aa987f8820bef21663ed8eebe68966b4ec66.tar.gz | |
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.emb_bind
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index eeaf96ce190..c3b7c77e252 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -46,7 +46,7 @@ mysqld_LDADD = @MYSQLD_EXTRA_LDFLAGS@ \ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ item_strfunc.h item_timefunc.h item_uniq.h \ item_create.h item_subselect.h item_row.h \ - mysql_priv.h \ + mysql_priv.h item_geofunc.h \ procedure.h sql_class.h sql_lex.h sql_list.h \ sql_manager.h sql_map.h sql_string.h unireg.h \ field.h handler.h \ @@ -62,7 +62,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ item_cmpfunc.cc item_strfunc.cc item_timefunc.cc \ thr_malloc.cc item_create.cc item_subselect.cc \ - item_row.cc \ + item_row.cc item_geofunc.cc \ field.cc key.cc sql_class.cc sql_list.cc \ net_serv.cc protocol.cc lock.cc my_lock.c \ sql_string.cc sql_manager.cc sql_map.cc \ |