diff options
| author | kostja@bodhi.local <> | 2006-07-08 02:30:07 +0400 |
|---|---|---|
| committer | kostja@bodhi.local <> | 2006-07-08 02:30:07 +0400 |
| commit | a2c0cdd75bcb343cf229c5aaf0631e9d520798cc (patch) | |
| tree | 7ce4c7f91fd3ddc20825211cb8c3d6e6dec818d7 /libmysqld | |
| parent | 96f4c10ddefb20a789bfa3d3941389d99bb371b1 (diff) | |
| parent | 86132d5d8fcb42d3753c5ed8e244210f5adfb829 (diff) | |
| download | mariadb-git-a2c0cdd75bcb343cf229c5aaf0631e9d520798cc.tar.gz | |
Merge bodhi.local:/opt/local/work/tmp_merge
into bodhi.local:/opt/local/work/mysql-5.0-runtime-merge-41
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 54eb27be037..89b473fb815 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -51,7 +51,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ key.cc lock.cc log.cc log_event.cc sql_state.c \ protocol.cc net_serv.cc opt_range.cc \ opt_sum.cc procedure.cc records.cc sql_acl.cc \ - sql_load.cc discover.cc \ + sql_load.cc discover.cc sql_locale.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 \ |