diff options
| author | unknown <monty@donna.mysql.fi> | 2001-05-23 23:49:06 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.fi> | 2001-05-23 23:49:06 +0300 |
| commit | 4d13177eb0a2bdbaf6533dac8afc288175151a5a (patch) | |
| tree | e403a32b4bf42886f792ab632f87b754b3ab6d9d /sql/Makefile.am | |
| parent | 607c8d8bd4a4647cd118d2ff308e08b6df7a8b98 (diff) | |
| parent | a542f858bf9f14da04f58223933b992749922d32 (diff) | |
| download | mariadb-git-4d13177eb0a2bdbaf6533dac8afc288175151a5a.tar.gz | |
Merge work:/home/bk/mysql-4.0 into donna.mysql.fi:/home/my/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
sql/Makefile.am:
Auto merged
sql/mysqld.cc:
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 b3e3e4c915c..218ff6bbd73 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -57,7 +57,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ sql_select.h structs.h table.h sql_udf.h hash_filo.h\ lex.h lex_symbol.h sql_acl.h sql_crypt.h md5.h \ log_event.h mini_client.h sql_repl.h slave.h \ - stacktrace.h + stacktrace.h sql_sort.h 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 \ @@ -68,7 +68,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ mysqld.cc password.c hash_filo.cc hostname.cc \ convert.cc sql_parse.cc sql_yacc.yy \ sql_base.cc table.cc sql_select.cc sql_insert.cc \ - sql_update.cc sql_delete.cc \ + sql_update.cc sql_delete.cc uniques.cc \ procedure.cc item_uniq.cc sql_test.cc \ log.cc log_event.cc init.cc derror.cc sql_acl.cc \ unireg.cc \ |