diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-09-10 03:18:29 -0600 |
| commit | 63e56390a3f1a4f80642932a790ab74f28de8010 (patch) | |
| tree | 8b611255f83ad274f072855f5acfe484a971de87 /sql/Makefile.am | |
| parent | 905d715f10e711860311e0a10488c6bb5e19ee49 (diff) | |
| download | mariadb-git-63e56390a3f1a4f80642932a790ab74f28de8010.tar.gz | |
WL#2110 (SIGNAL)
WL#2265 (RESIGNAL)
Manual merge of SIGNAL and RESIGNAL to mysql-trunk-signal,
plus required dependencies.
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 5263e62a439..600a6117ebf 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -110,7 +110,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ sql_plugin.h authors.h event_parse_data.h \ event_data_objects.h event_scheduler.h \ sql_partition.h partition_info.h partition_element.h \ - contributors.h sql_servers.h + contributors.h sql_servers.h sql_signal.h mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ item.cc item_sum.cc item_buff.cc item_func.cc \ @@ -154,7 +154,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc sql_partition.cc \ event_queue.cc event_db_repository.cc events.cc \ sql_plugin.cc sql_binlog.cc \ sql_builtin.cc sql_tablespace.cc partition_info.cc \ - sql_servers.cc event_parse_data.cc + sql_servers.cc event_parse_data.cc sql_signal.cc nodist_mysqld_SOURCES = mini_client_errors.c pack.c client.c my_time.c my_user.c |