diff options
| author | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-02-22 15:30:28 +0400 |
|---|---|---|
| committer | unknown <bar@gw.udmsearch.izhnet.ru> | 2002-02-22 15:30:28 +0400 |
| commit | 1e468e3bd70761aa04227239bf4239d3b6a9dc12 (patch) | |
| tree | 6845bf051296a682ce30b1a60a389b77accfa4a1 /libmysqld | |
| parent | b569a092e9438219c730ce818891178525be49fc (diff) | |
| parent | 32a08516c974045bfc16fb30fcac18bb7ad8fbb8 (diff) | |
| download | mariadb-git-1e468e3bd70761aa04227239bf4239d3b6a9dc12.tar.gz | |
Merge abarkov@work.mysql.com:/home/bk/mysql-4.1
into gw.udmsearch.izhnet.ru:/usr/home/bar/mysql-4.1
BitKeeper/etc/ignore:
auto-union
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index edee13c98bb..6e5c0b183bb 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -53,7 +53,8 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ sql_rename.cc sql_repl.cc sql_select.cc sql_do.cc sql_show.cc \ sql_string.cc sql_table.cc sql_test.cc sql_udf.cc \ sql_update.cc sql_yacc.cc table.cc thr_malloc.cc time.cc \ - unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc + unireg.cc uniques.cc stacktrace.c sql_union.cc hash_filo.cc \ + spatial.cc gstream.cc EXTRA_DIST = lib_vio.c |