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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 781dadadd71..c3c99583ad9 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -42,7 +42,7 @@ sqlsources = derror.cc field.cc field_conv.cc filesort.cc \ hostname.cc init.cc password.c \ item.cc item_buff.cc item_cmpfunc.cc item_create.cc \ item_func.cc item_strfunc.cc item_sum.cc item_timefunc.cc \ - item_uniq.cc item_subselect.cc item_row.cc\ + item_geofunc.cc item_uniq.cc item_subselect.cc item_row.cc\ key.cc lock.cc log.cc log_event.cc \ protocol.cc net_serv.cc opt_ft.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc sql_acl.cc \ |