diff options
author | unknown <hartmut@mysql.com> | 2005-09-30 18:16:57 +0200 |
---|---|---|
committer | unknown <hartmut@mysql.com> | 2005-09-30 18:16:57 +0200 |
commit | 7d3c939e81f8da8c9f57421864e07b4315f03f57 (patch) | |
tree | e8f6638a94b8cca6df059c2a836b5b37761c6195 /sql/handler.cc | |
parent | 0585fcbe639000fa9e4210e2a4149570268f8a72 (diff) | |
parent | 39ba8376e6a3331a2c75fb3f9f5fbd6ff42f6a62 (diff) | |
download | mariadb-git-7d3c939e81f8da8c9f57421864e07b4315f03f57.tar.gz |
Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
ndb/tools/ndb_config.cpp:
Auto merged
Diffstat (limited to 'sql/handler.cc')
-rw-r--r-- | sql/handler.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index b7b599a0a90..39d9b706ed2 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -38,7 +38,7 @@ extern handlerton blackhole_hton; extern handlerton example_hton; #endif #ifdef HAVE_ARCHIVE_DB -#include "examples/ha_archive.h" +#include "ha_archive.h" extern handlerton archive_hton; #endif #ifdef HAVE_CSV_DB |