diff options
| author | unknown <brian@avenger.(none)> | 2004-08-13 16:27:17 -0700 |
|---|---|---|
| committer | unknown <brian@avenger.(none)> | 2004-08-13 16:27:17 -0700 |
| commit | 2d8f4a61bf49613f326407af75ce6dd8badfe21c (patch) | |
| tree | 9620e1e05dda7035c2036a5b0c7f7c89faacb947 /sql/Makefile.am | |
| parent | a5a4ed90f59c24e213af46c96e27a7104bdff89a (diff) | |
| parent | ff5ade15bd2536cd15ba3fa3bfb8f325d83283fa (diff) | |
| download | mariadb-git-2d8f4a61bf49613f326407af75ce6dd8badfe21c.tar.gz | |
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
into avenger.(none):/export/brian/tina-4.1
acinclude.m4:
Auto merged
BitKeeper/deleted/.del-acconfig.h~8d2e3113fc8056da:
Auto merged
configure.in:
Auto merged
sql/Makefile.am:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 4eaf6d5377e..1a984604dbf 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -60,7 +60,8 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ log_event.h sql_repl.h slave.h \ stacktrace.h sql_sort.h sql_cache.h set_var.h \ spatial.h gstream.h client_settings.h tzfile.h \ - tztime.h examples/ha_example.h examples/ha_archive.h + tztime.h examples/ha_example.h examples/ha_archive.h \ + examples/ha_tina.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 \ @@ -91,7 +92,8 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ stacktrace.c repl_failsafe.h repl_failsafe.cc \ gstream.cc spatial.cc sql_help.cc protocol_cursor.cc \ tztime.cc my_time.c \ - examples/ha_example.cc examples/ha_archive.cc + examples/ha_example.cc examples/ha_archive.cc \ + examples/ha_tina.cc gen_lex_hash_SOURCES = gen_lex_hash.cc gen_lex_hash_LDADD = $(LDADD) $(CXXLDFLAGS) |