Commit 5c24a8fe authored by unknown's avatar unknown
Browse files

Moving archive from example to sql. 


sql/ha_archive.h:
  Rename: sql/examples/ha_archive.h -> sql/ha_archive.h
libmysqld/Makefile.am:
  Moved archive files references
sql/Makefile.am:
  Moved archive from example to sql
sql/ha_archive.cc:
  Moved location of prov file.
sql/handler.cc:
  Moved location from examples to sql
parent 0fda286a

libmysqld/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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=

sql/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -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

sql/examples/ha_archive.cc→sql/ha_archive.cc

+1 −1
Original line number Diff line number Diff line
@@ -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"

sql/examples/ha_archive.h→sql/ha_archive.h

+0 −0

File moved.

View file

sql/handler.cc

+1 −1
Original line number Diff line number Diff line
@@ -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