diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-03 18:24:28 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-03 18:24:28 -0500 |
| commit | bd2cc79a95993f088a82c2bc5ccd1ba647bd1c2d (patch) | |
| tree | 4377783fbb5881088a2e6f6feef7948db014eb3a /sql/Makefile.am | |
| parent | 2e99ee900ac48cfb406f88b9418bfd99a55d3f55 (diff) | |
| parent | 66dfd85cf4d55e6d87e8bb81b8fc8450eb9b3f67 (diff) | |
| download | mariadb-git-bd2cc79a95993f088a82c2bc5ccd1ba647bd1c2d.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-community
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
BitKeeper/etc/collapsed:
auto-union
libmysqld/Makefile.am:
Auto merged
sql/Makefile.am:
Auto merged
sql/ha_archive.cc:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/lex.h:
Auto merged
sql/lock.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/repl_failsafe.cc:
Auto merged
sql/slave.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'sql/Makefile.am')
| -rw-r--r-- | sql/Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 20c4527185b..df16961dfd8 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -51,6 +51,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \ procedure.h sql_class.h sql_lex.h sql_list.h \ sql_manager.h sql_map.h sql_string.h unireg.h \ sql_error.h field.h handler.h mysqld_suffix.h \ + sql_profile.h \ ha_myisammrg.h\ ha_heap.h ha_myisam.h ha_berkeley.h ha_innodb.h \ ha_ndbcluster.h opt_range.h protocol.h \ @@ -79,6 +80,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \ set_var.cc sql_parse.cc sql_yacc.yy \ sql_base.cc table.cc sql_select.cc sql_insert.cc \ sql_prepare.cc sql_error.cc sql_locale.cc \ + sql_profile.cc \ sql_update.cc sql_delete.cc uniques.cc sql_do.cc \ procedure.cc item_uniq.cc sql_test.cc \ log.cc log_event.cc init.cc derror.cc sql_acl.cc \ |