diff options
| author | unknown <mjorgensen@production.mysql.com> | 2007-01-12 00:10:18 +0100 |
|---|---|---|
| committer | unknown <mjorgensen@production.mysql.com> | 2007-01-12 00:10:18 +0100 |
| commit | 46169fdc9b43e35dedf5f8ac43f6c6fb080bf336 (patch) | |
| tree | c4c8dcc1816d243dc4436275e97dd18e56874c31 /libmysqld | |
| parent | 50361d9a44ddce3d0253feba9c658a17b2b0a517 (diff) | |
| parent | 8326c2c25dd9038781951b00ed6e6e04e612e8ff (diff) | |
| download | mariadb-git-46169fdc9b43e35dedf5f8ac43f6c6fb080bf336.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into production.mysql.com:/usersnfs/mjorgensen/bktrees/mysql-5.0-community
configure.in:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 330e72e5507..1687dbed079 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -53,6 +53,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ protocol.cc net_serv.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc sql_acl.cc \ sql_load.cc discover.cc sql_locale.cc \ + sql_profile.cc \ sql_analyse.cc sql_base.cc sql_cache.cc sql_class.cc \ sql_crypt.cc sql_db.cc sql_delete.cc sql_error.cc sql_insert.cc \ sql_lex.cc sql_list.cc sql_manager.cc sql_map.cc sql_parse.cc \ |