mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 03:21:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse source 
into  zim.(none):/home/brian/mysql/archive-move
This commit is contained in:
brian@zim.(none) 2005-09-28 19:07:43 -07:00
commit db486f4da1
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libmysqld/Makefile.am
View file

@ -37,7 +37,7 @@ SUBDIRS = . examples
libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc
libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \
my_time.c
sqlexamplessources = ha_example.cc ha_archive.cc ha_tina.cc
sqlexamplessources = ha_example.cc ha_tina.cc
noinst_HEADERS = embedded_priv.h emb_qcache.h
@ -63,7 +63,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \
spatial.cc gstream.cc sql_help.cc tztime.cc sql_cursor.cc \
sp_head.cc sp_pcontext.cc sp.cc sp_cache.cc sp_rcontext.cc \
parse_file.cc sql_view.cc sql_trigger.cc my_decimal.cc \
ha_blackhole.cc
ha_blackhole.cc ha_archive.cc
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources) $(sqlexamplessources)
libmysqld_a_SOURCES=

4
sql/Makefile.am
View file

@ -62,7 +62,7 @@ noinst_HEADERS = item.h item_func.h item_sum.h item_cmpfunc.h \
sp_head.h sp_pcontext.h sp_rcontext.h sp.h sp_cache.h \
parse_file.h sql_view.h sql_trigger.h \
sql_array.h sql_cursor.h \
examples/ha_example.h examples/ha_archive.h \
examples/ha_example.h ha_archive.h \
examples/ha_tina.h ha_blackhole.h \
ha_federated.h
mysqld_SOURCES = sql_lex.cc sql_handler.cc \
@ -98,7 +98,7 @@ mysqld_SOURCES = sql_lex.cc sql_handler.cc \
tztime.cc my_time.c my_decimal.cc\
sp_head.cc sp_pcontext.cc sp_rcontext.cc sp.cc \
sp_cache.cc parse_file.cc sql_trigger.cc \
examples/ha_example.cc examples/ha_archive.cc \
examples/ha_example.cc ha_archive.cc \
examples/ha_tina.cc ha_blackhole.cc \
ha_federated.cc

2
sql/examples/ha_archive.cc → sql/ha_archive.cc
View file

@ -18,7 +18,7 @@
#pragma implementation // gcc: Class implementation
#endif
#include "../mysql_priv.h"
#include "mysql_priv.h"
#ifdef HAVE_ARCHIVE_DB
#include "ha_archive.h"

0
sql/examples/ha_archive.h → sql/ha_archive.h
View file

2
sql/handler.cc
View file

@ -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