diff options
| author | unknown <brian@zim.(none)> | 2005-03-25 10:36:58 -0800 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2005-03-25 10:36:58 -0800 |
| commit | 6b46566532e0ea2ccb217fb33b0e2ada5e7e9227 (patch) | |
| tree | ce669841b0cdc8fd6688ec662273b8120016a473 /sql/Makefile.am | |
| parent | 34b7d36ca9724c6ebda3b6aaab5c0e8bcc9b2a9f (diff) | |
| parent | fe3beec4a439346d4d66bc3a975c920b96321566 (diff) | |
| download | mariadb-git-6b46566532e0ea2ccb217fb33b0e2ada5e7e9227.tar.gz | |
Merging support for blackhole up to 5.0.
configure.in:
Auto merged
BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/Makefile.am:
Edited for adding blackhole.
sql/handler.cc:
Edited for adding blackhole.
sql/handler.h:
Edited for blackhole.
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index bd371cd77bf..e0ff324b33c 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -62,9 +62,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \ parse_file.h sql_view.h sql_trigger.h \ examples/ha_example.h examples/ha_archive.h \ - examples/ha_tina.h \ + examples/ha_tina.h ha_blackhole.h \ ha_federated.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 \ @@ -99,7 +98,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \ sp_cache.cc parse_file.cc sql_trigger.cc \ examples/ha_example.cc examples/ha_archive.cc \ - examples/ha_tina.cc \ + examples/ha_tina.cc ha_blackhole.cc \ ha_federated.cc gen_lex_hash_SOURCES = gen_lex_hash.cc |