Merge lp:~mordred/drizzle/plugin-slot-reorg into lp:~drizzle-trunk/drizzle/development

[Monty Taylor]

[Monty Taylor (mordred)]

zomg. slots slots and more slots. We're getting somewhere...

[Jay Pipes (jaypipes)]

Please merge with trunk :)

review: Needs Fixing

[Jay Pipes (jaypipes)]

Overall, the patch is fantastic and cleans up a crap-ton of code.

However, there is *one* thing that I'd like to see changed. You changed InfoSchemaTable to plugin::InfoSchema. I find this confusing, especially given the slot::InfoSchema.

Basically, slot::InfoSchema is correct, but plugin::InfoSchema should, IMHO, be plugin::InfoSchemaTable or plugin::InfoSchemaView. Because plugin::InfoSchema is actually the table/view, not the schema itself.

review: Needs Fixing

[Monty Taylor (mordred)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jay Pipes wrote:
> Review: Needs Fixing Overall, the patch is fantastic and cleans up a
> crap-ton of code.
>
> However, there is *one* thing that I'd like to see changed. You
> changed InfoSchemaTable to plugin::InfoSchema. I find this
> confusing, especially given the slot::InfoSchema.
>
> Basically, slot::InfoSchema is correct, but plugin::InfoSchema
> should, IMHO, be plugin::InfoSchemaTable or plugin::InfoSchemaView.
> Because plugin::InfoSchema is actually the table/view, not the schema
> itself.

Fair enough.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkq72RIACgkQ2Jv7/VK1RgFQFgCg08ujA3d80RB+j4UXyKIWAgwk
RQAAoJpUT5y4whsa6zIHxsrfZkeVT9+L
=KDz2
-----END PGP SIGNATURE-----

[Jay Pipes (jaypipes)]

Great! All tests passing on all my build platforms. This is now in lp:~jaypipes/drizzle/captain-20090924-02 and is proposed for merging into trunk.

review: Approve

[Monty Taylor (mordred)]

Addressed Brian's review comments.

[Brian Aker (brianaker)]

Hi!

Is there a 1 to 1 correlation between slot and plugin? If so we
should have them named the same (or... should slot... be a part of
plugin).

Cheers,
 -Brian

On Sep 27, 2009, at 4:10 PM, Monty Taylor wrote:

> Monty Taylor has proposed merging lp:~mordred/drizzle/plugin-slot-
> reorg into lp:drizzle.
>
> Requested reviews:
> Brian Aker (brianaker):
> Jay Pipes (jaypipes)
>
> --
> https://code.launchpad.net/~mordred/drizzle/plugin-slot-reorg/+merge/12502
> You are requested to review the proposed merge of lp:~mordred/
> drizzle/plugin-slot-reorg into lp:drizzle.
> === modified file '.bzrignore'
> --- .bzrignore 2009-08-03 14:23:22 +0000
> +++ .bzrignore 2009-09-27 23:10:30 +0000
> @@ -275,3 +275,4 @@
> drizzled/message/command_reader
> TAGS
> *replication.pb.*
> +drizzled/message/table_raw_reader
>
> === modified file 'drizzled/Makefile.am'
> --- drizzled/Makefile.am 2009-09-23 17:01:21 +0000
> +++ drizzled/Makefile.am 2009-09-27 23:10:30 +0000
> @@ -38,53 +38,10 @@
> atomic/pthread_traits.h \
> atomic/sun_studio.h \
> atomics.h \
> - authentication.h \
> base.h \
> cached_item.h \
> calendar.h \
> check_stack_overrun.h \
> - statement.h \
> - statement/alter_schema.h \
> - statement/alter_table.h \
> - statement/analyze.h \
> - statement/change_schema.h \
> - statement/check.h \
> - statement/checksum.h \
> - statement/commit.h \
> - statement/create_index.h \
> - statement/create_schema.h \
> - statement/create_table.h \
> - statement/delete.h \
> - statement/drop_index.h \
> - statement/drop_schema.h \
> - statement/drop_table.h \
> - statement/empty_query.h \
> - statement/flush.h \
> - statement/insert.h \
> - statement/insert_select.h \
> - statement/kill.h \
> - statement/load.h \
> - statement/optimize.h \
> - statement/release_savepoint.h \
> - statement/rename_table.h \
> - statement/replace.h \
> - statement/replace_select.h \
> - statement/rollback.h \
> - statement/rollback_to_savepoint.h \
> - statement/savepoint.h \
> - statement/select.h \
> - statement/set_option.h \
> - statement/show_create.h \
> - statement/show_create_schema.h \
> - statement/show_engine_status.h \
> - statement/show_errors.h \
> - statement/show_processlist.h \
> - statement/show_status.h \
> - statement/show_warnings.h \
> - statement/start_transaction.h \
> - statement/truncate.h \
> - statement/unlock_tables.h \
> - statement/update.h \
> common.h \
> comp_creator.h \
> cost_vect.h \
> @@ -98,7 +55,6 @@
> dtcollation.h \
> enum.h \
> enum_nested_loop_state.h \
> - errmsg.h \
> errmsg_print.h \
> error.h \
> field.h \
> @@ -240,7 +196,6 @@
> hybrid_type_traits_decimal.h \
> hybrid_type_traits_integer.h \
> index_hint.h \
> - info_schema.h \
> internal_error_handler.h \
> item.h \
> item/basic_constant.h \
> @@ -293,7 +248,6 @@
> lex_string.h \
> lex_symbol.h \
> lock.h \
> - logging.h \
> lookup_symbol.h \
> my_decimal.h\
> my_var.h \
> @@ -302,36 +256,35 @@
> natural_join_column.h \
> nested_join.h \
> open_tables_state.h \
> + opt_range.h \
> optimizer/key_field.h \
> optimizer/position.h \
> optimizer/sargable_param...

[Brian Aker (brianaker)]

Hi!

Found another thing:

namespace drizzled
{
namespace plugin
{
   class InfoSchemaTable;
}
}

That is too wordy, collapse into a single line.

One more note on my previous comment about slot (now service),... is
this the same thing as plugin? Is a plugin a collection of services? I
see two things named info_schema (which should be information schema)
and they are named differently, but everything else is nearly 1=1.

What is the end goal of the architecture?

Cheers,
 -Brian

On Sep 27, 2009, at 4:06 PM, Monty Taylor wrote:

> You have been requested to review the proposed merge of lp:~mordred/
> drizzle/plugin-slot-reorg into lp:drizzle.
>
>
>
> --
> https://code.edge.launchpad.net/~mordred/drizzle/plugin-slot-reorg/+merge/12502
> You are requested to review the proposed merge of lp:~mordred/
> drizzle/plugin-slot-reorg into lp:drizzle.

[Monty Taylor (mordred)]

I've made changes based on Brian's comments. What were the slot/service methods are now static methods on the plugin classes themselves. This did allow us to achieve a very nice code cleanup in drizzled/plugin/registry.h - which is still compile-time safe, so I'm happy about that.

After this branch, I have a style-cleanup branch that builds on this one, and then a branch which adds a Plugin base class to all plugin types.

[Monty Taylor (mordred)]

Changed the method naming and plugin::Registry::add error handling based on Brian's feedback. There are a couple of other things - some indentation issues and actually printing the error message in plugin::Registry::add() that still need to be done, but will need to wait until after plugin-base-class and memory-file-move have been merged in, otherwise it'll cause a giant bag of hurt. (and if all goes well, perhaps those can be merge in today too)

=== modified file '.bzrignore'
--- .bzrignore	2009-08-03 14:23:22 +0000
+++ .bzrignore	2009-09-30 21:30:29 +0000
@@ -275,3 +275,4 @@
 drizzled/message/command_reader
 TAGS
 *replication.pb.*
+drizzled/message/table_raw_reader
 
=== modified file 'drizzled/Makefile.am'
--- drizzled/Makefile.am	2009-09-29 15:38:49 +0000
+++ drizzled/Makefile.am	2009-09-30 21:30:29 +0000
@@ -38,53 +38,10 @@
 		atomic/pthread_traits.h \
 		atomic/sun_studio.h \
 		atomics.h \
-		authentication.h \
 		base.h \
 		cached_item.h \
 		calendar.h \
 		check_stack_overrun.h \
-		statement.h \
-		statement/alter_schema.h \
-		statement/alter_table.h \
-		statement/analyze.h \
-		statement/change_schema.h \
-		statement/check.h \
-		statement/checksum.h \
-		statement/commit.h \
-		statement/create_index.h \
-		statement/create_schema.h \
-		statement/create_table.h \
-		statement/delete.h \
-		statement/drop_index.h \
-		statement/drop_schema.h \
-		statement/drop_table.h \
-		statement/empty_query.h \
-		statement/flush.h \
-		statement/insert.h \
-		statement/insert_select.h \
-		statement/kill.h \
-		statement/load.h \
-		statement/optimize.h \
-		statement/release_savepoint.h \
-		statement/rename_table.h \
-		statement/replace.h \
-		statement/replace_select.h \
-		statement/rollback.h \
-		statement/rollback_to_savepoint.h \
-		statement/savepoint.h \
-		statement/select.h \
-		statement/set_option.h \
-		statement/show_create.h \
-		statement/show_create_schema.h \
-		statement/show_engine_status.h \
-		statement/show_errors.h \
-		statement/show_processlist.h \
-		statement/show_status.h \
-		statement/show_warnings.h \
-		statement/start_transaction.h \
-		statement/truncate.h \
-		statement/unlock_tables.h \
-		statement/update.h \
 		common.h \
 		comp_creator.h \
 		cost_vect.h \
@@ -99,7 +56,6 @@
 		dtcollation.h \
 		enum.h \
 		enum_nested_loop_state.h \
-		errmsg.h \
 		errmsg_print.h \
 		error.h \
 		field.h \
@@ -241,7 +197,6 @@
 		hybrid_type_traits_decimal.h \
 		hybrid_type_traits_integer.h \
 		index_hint.h \
-		info_schema.h \
 		internal_error_handler.h \
 		item.h \
 		item/basic_constant.h \
@@ -294,7 +249,6 @@
 		lex_string.h \
 		lex_symbol.h \
 		lock.h \
-		logging.h \
 		lookup_symbol.h \
 		my_decimal.h\
 		my_var.h \
@@ -303,37 +257,36 @@
 		natural_join_column.h \
 		nested_join.h \
 		open_tables_state.h \
+		opt_range.h \
 		optimizer/key_field.h \
 		optimizer/key_use.h \
 		optimizer/position.h \
 		optimizer/sargable_param.h \
-		opt_range.h \
 		order.h \
 		plugin.h \
-		plugin/registry.h \
+		plugin/authentication.h \
+		plugin/client.h \
 		plugin/command_applier.h \
 		plugin/command_reader.h \
 		plugin/command_replicator.h \
-		plugin/authentication.h \
-		plugin/client.h \
-		plugin/error_message_handler.h \
+		plugin/error_message.h \
 		plugin/function.h \
 		plugin/handle.h \
+		plugin/info_schema_table.h \
 		plugin/library.h \
 		plugin/listen.h \
 		plugin/listen_tcp.h \
-		plugin/logging_handler.h \
+		plugin/logging.h \
 		plugin/manifest.h \
 		plugin/null_client.h \
-		plugin/qcache.h \
+		plugin/query_cache.h \
+		plugin/registry.h \
 		plugin/scheduler.h \
 		plugin/storage_engine.h \
 		probes.h \
-		qcache.h \
 		query_id.h \
 		registry.h \
 		replication_services.h \
-		scheduling.h \
 		security_context.h \
 		select_create.h \
 		select_dump.h \
@@ -352,8 +305,6 @@
 		session.h \
 		set_var.h \
 		show.h \
-		slot/function.h \
-		slot/listen.h \
 		sql_alloc.h \
 		sql_array.h \
 		sql_base.h \
@@ -364,7 +315,6 @@
 		sql_load.h \
 		sql_locale.h \
 		sql_parse.h \
-		sql_plugin.h \
 		sql_select.h \
 		sql_sort.h \
 		sql_state.h \
@@ -372,6 +322,48 @@
 		sql_table.h \
 		sql_union.h \
 		stacktrace.h \
+		statement.h \
+		statement/alter_schema.h \
+		statement/alter_table.h \
+		statement/analyze.h \
+		statement/change_schema.h \
+		statement/check.h \
+		statement/checksum.h \
+		statement/commit.h \
+		statement/create_index.h \
+		statement/create_schema.h \
+		statement/create_table.h \
+		statement/delete.h \
+		statement/drop_index.h \
+		statement/drop_schema.h \
+		statement/drop_table.h \
+		statement/empty_query.h \
+		statement/flush.h \
+		statement/insert.h \
+		statement/insert_select.h \
+		statement/kill.h \
+		statement/load.h \
+		statement/optimize.h \
+		statement/release_savepoint.h \
+		statement/rename_table.h \
+		statement/replace.h \
+		statement/replace_select.h \
+		statement/rollback.h \
+		statement/rollback_to_savepoint.h \
+		statement/savepoint.h \
+		statement/select.h \
+		statement/set_option.h \
+		statement/show_create.h \
+		statement/show_create_schema.h \
+		statement/show_engine_status.h \
+		statement/show_errors.h \
+		statement/show_processlist.h \
+		statement/show_status.h \
+		statement/show_warnings.h \
+		statement/start_transaction.h \
+		statement/truncate.h \
+		statement/unlock_tables.h \
+		statement/update.h \
 		stored_key.h \
 		structs.h \
 		symbol_hash.h \
@@ -379,8 +371,8 @@
 		table_ident.h \
 		table_list.h \
 		table_map_iterator.h \
+		table_proto.h \
 		table_reference.h \
-		table_proto.h \
 		table_share.h \
 		temporal.h \
 		temporal_format.h \
@@ -390,11 +382,11 @@
 		tztime.h \
 		unique.h \
 		unireg.h \
+		user_var_entry.h \
 		utf8.h \
 		utf8/checked.h \
 		utf8/core.h \
 		utf8/unchecked.h \
-		user_var_entry.h \
 		xid.h
 
 noinst_LTLIBRARIES = \
@@ -425,51 +417,9 @@
 
 drizzled_SOURCES = \
 		alter_info.cc \
-		authentication.cc \
 		cached_item.cc \
 		calendar.cc \
 		check_stack_overrun.cc \
-		statement/alter_schema.cc \
-		statement/alter_table.cc \
-		statement/analyze.cc \
-		statement/change_schema.cc \
-		statement/check.cc \
-		statement/checksum.cc \
-		statement/commit.cc \
-		statement/create_index.cc \
-		statement/create_schema.cc \
-		statement/create_table.cc \
-		statement/delete.cc \
-		statement/drop_index.cc \
-		statement/drop_schema.cc \
-		statement/drop_table.cc \
-		statement/empty_query.cc \
-		statement/flush.cc \
-		statement/insert.cc \
-		statement/insert_select.cc \
-		statement/kill.cc \
-		statement/load.cc \
-		statement/optimize.cc \
-		statement/release_savepoint.cc \
-		statement/rename_table.cc \
-		statement/replace.cc \
-		statement/replace_select.cc \
-		statement/rollback.cc \
-		statement/rollback_to_savepoint.cc \
-		statement/savepoint.cc \
-		statement/select.cc \
-		statement/set_option.cc \
-		statement/show_create.cc \
-		statement/show_create_schema.cc \
-		statement/show_engine_status.cc \
-		statement/show_errors.cc \
-		statement/show_processlist.cc \
-		statement/show_status.cc \
-		statement/show_warnings.cc \
-		statement/start_transaction.cc \
-		statement/truncate.cc \
-		statement/unlock_tables.cc \
-		statement/update.cc \
 		comp_creator.cc \
 		crc32.cc \
 		create_field.cc \
@@ -477,15 +427,15 @@
 		diagnostics_area.cc \
 		drizzled.cc \
 		dtcollation.cc \
-		errmsg.cc \
+		errmsg_print.cc \
 		error.cc \
-		errmsg_print.cc \
+		field.cc \
 		field/blob.cc \
 		field/date.cc \
 		field/datetime.cc \
-		field/enum.cc \
 		field/decimal.cc \
 		field/double.cc \
+		field/enum.cc \
 		field/int64_t.cc \
 		field/long.cc \
 		field/null.cc \
@@ -494,7 +444,6 @@
 		field/str.cc \
 		field/timestamp.cc \
 		field/varstring.cc \
-		field.cc \
 		field_conv.cc \
 		field_iterator.cc \
 		filesort.cc \
@@ -510,17 +459,6 @@
 		function/get_user_var.cc \
 		function/last_insert.cc \
 		function/locate.cc \
-		function/min_max.cc \
-		function/num1.cc \
-		function/numhybrid.cc \
-		function/num_op.cc \
-		function/row_count.cc \
-		function/set_user_var.cc \
-		function/sign.cc \
-		function/signed.cc \
-		function/units.cc \
-		function/unsigned.cc \
-		function/user_var_as_out_param.cc \
 		function/math/abs.cc \
 		function/math/acos.cc \
 		function/math/asin.cc \
@@ -531,10 +469,10 @@
 		function/math/divide.cc \
 		function/math/exp.cc \
 		function/math/floor.cc \
+		function/math/int.cc \
 		function/math/int_divide.cc \
+		function/math/int_val.cc \
 		function/math/integer.cc \
-		function/math/int.cc \
-		function/math/int_val.cc \
 		function/math/ln.cc \
 		function/math/log.cc \
 		function/math/minus.cc \
@@ -550,6 +488,14 @@
 		function/math/sin.cc \
 		function/math/sqrt.cc \
 		function/math/tan.cc \
+		function/min_max.cc \
+		function/num1.cc \
+		function/num_op.cc \
+		function/numhybrid.cc \
+		function/row_count.cc \
+		function/set_user_var.cc \
+		function/sign.cc \
+		function/signed.cc \
 		function/str/alloc_buffer.cc \
 		function/str/binary.cc \
 		function/str/char.cc \
@@ -586,8 +532,8 @@
 		function/time/date_format.cc \
 		function/time/dayname.cc \
 		function/time/dayofmonth.cc \
+		function/time/dayofyear.cc \
 		function/time/extract.cc \
-		function/time/dayofyear.cc \
 		function/time/from_days.cc \
 		function/time/from_unixtime.cc \
 		function/time/hour.cc \
@@ -597,9 +543,9 @@
 		function/time/minute.cc \
 		function/time/month.cc \
 		function/time/now.cc \
-		function/time/quarter.cc \
 		function/time/period_add.cc \
 		function/time/period_diff.cc \
+		function/time/quarter.cc \
 		function/time/second.cc \
 		function/time/sysdate_local.cc \
 		function/time/timestamp_diff.cc \
@@ -608,11 +554,15 @@
 		function/time/unix_timestamp.cc \
 		function/time/weekday.cc \
 		function/time/year.cc \
+		function/units.cc \
+		function/unsigned.cc \
+		function/user_var_as_out_param.cc \
 		ha_trx_info.cc \
 		hybrid_type_traits.cc \
 		hybrid_type_traits_decimal.cc \
 		hybrid_type_traits_integer.cc \
 		index_hint.cc \
+		item.cc \
 		item/bin_string.cc \
 		item/cache.cc \
 		item/cache_decimal.cc \
@@ -630,10 +580,10 @@
 		item/field.cc \
 		item/float.cc \
 		item/hex_string.cc \
+		item/ident.cc \
 		item/insert_value.cc \
+		item/int.cc \
 		item/int_with_ref.cc \
-		item/ident.cc \
-		item/int.cc \
 		item/null.cc \
 		item/num.cc \
 		item/outer_ref.cc \
@@ -646,32 +596,39 @@
 		item/sum.cc \
 		item/type_holder.cc \
 		item/uint.cc \
-		item.cc \
 		join.cc \
 		join_cache.cc \
 		join_table.cc \
 		key.cc \
 		key_map.cc \
 		lock.cc \
-		logging.cc \
 		lookup_symbol.cc \
 		my_decimal.cc \
 		name_resolution_context_state.cc \
 		natural_join_column.cc \
-		optimizer/key_field.cc \
 		opt_range.cc \
 		opt_sum.cc \
+		optimizer/key_field.cc \
+		plugin/authentication.cc \
+		plugin/command_applier.cc \
+		plugin/command_replicator.cc \
+		plugin/error_message.cc \
+		plugin/function.cc \
+		plugin/info_schema_table.cc \
+		plugin/listen.cc \
 		plugin/listen_tcp.cc \
+		plugin/loader.cc \
+		plugin/logging.cc \
+		plugin/query_cache.cc \
 		plugin/registry.cc \
-		qcache.cc \
+		plugin/scheduler.cc \
 		query_id.cc \
 		records.cc \
-		scheduling.cc \
+		replication_services.cc \
 		session.cc \
 		set_var.cc \
 		show.cc \
-		slot/function.cc \
-		slot/listen.cc \
+		sql_alloc.cc \
 		sql_base.cc \
 		sql_delete.cc \
 		sql_derived.cc \
@@ -682,7 +639,6 @@
 		sql_load.cc \
 		sql_locale.cc \
 		sql_parse.cc \
-		sql_plugin.cc \
 		sql_select.cc \
 		sql_state.cc \
 		sql_string.cc \
@@ -691,17 +647,56 @@
 		sql_update.cc \
 		sql_yacc.yy \
 		stacktrace.cc \
+		statement/alter_schema.cc \
+		statement/alter_table.cc \
+		statement/analyze.cc \
+		statement/change_schema.cc \
+		statement/check.cc \
+		statement/checksum.cc \
+		statement/commit.cc \
+		statement/create_index.cc \
+		statement/create_schema.cc \
+		statement/create_table.cc \
+		statement/delete.cc \
+		statement/drop_index.cc \
+		statement/drop_schema.cc \
+		statement/drop_table.cc \
+		statement/empty_query.cc \
+		statement/flush.cc \
+		statement/insert.cc \
+		statement/insert_select.cc \
+		statement/kill.cc \
+		statement/load.cc \
+		statement/optimize.cc \
+		statement/release_savepoint.cc \
+		statement/rename_table.cc \
+		statement/replace.cc \
+		statement/replace_select.cc \
+		statement/rollback.cc \
+		statement/rollback_to_savepoint.cc \
+		statement/savepoint.cc \
+		statement/select.cc \
+		statement/set_option.cc \
+		statement/show_create.cc \
+		statement/show_create_schema.cc \
+		statement/show_engine_status.cc \
+		statement/show_errors.cc \
+		statement/show_processlist.cc \
+		statement/show_status.cc \
+		statement/show_warnings.cc \
+		statement/start_transaction.cc \
+		statement/truncate.cc \
+		statement/unlock_tables.cc \
+		statement/update.cc \
 		strfunc.cc \
 		table.cc \
 		table_list.cc \
-                table_map_iterator.cc \
+		table_map_iterator.cc \
 		table_share.cc \
 		temporal.cc \
 		temporal_format.cc \
 		temporal_interval.cc \
-		thr_malloc.cc \
 		time.cc \
-		replication_services.cc \
 		tztime.cc \
 		uniques.cc \
 		user_var_entry.cc \
@@ -722,7 +717,6 @@
 		plugin/storage_engine.h.gch  \
 		sql_base.h.gch \
 		sql_parse.h.gch \
-		sql_plugin.h.gch \
 		util/convert.h.gch \
 		util/test.h.gch
 else
@@ -738,7 +732,6 @@
 		$(PCHHEADERS) 
 
 EXTRA_DIST = \
-		plugin/config.h.in \
 		$(BUILT_MAINT_SRC) \
 		symbol_hash.gperf \
 		function_hash.gperf \
 
=== removed file 'drizzled/authentication.h'
--- drizzled/authentication.h	2009-05-11 17:50:22 +0000
+++ drizzled/authentication.h	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-
-#ifndef DRIZZLED_AUTHENTICATION_H
-#define DRIZZLED_AUTHENTICATION_H
-
-#include <drizzled/plugin/authentication.h>
-
-bool authenticate_user(Session *session, const char *password);
-void add_authentication(Authentication *auth);
-void remove_authentication(Authentication *auth);
-
-#endif /* DRIZZLED_AUTHENTICATION_H */
 
=== modified file 'drizzled/db.cc'
--- drizzled/db.cc	2009-08-19 23:35:29 +0000
+++ drizzled/db.cc	2009-09-30 21:30:29 +0000
@@ -38,8 +38,6 @@
 
 using namespace drizzled;
 
-extern drizzled::ReplicationServices replication_services;
-
 #define MY_DB_OPT_FILE "db.opt"
 #define MAX_DROP_TABLE_Q_LEN      1024
 
@@ -190,6 +188,7 @@
 
 bool mysql_create_db(Session *session, const char *db, HA_CREATE_INFO *create_info)
 {
+  ReplicationServices &replication_services= ReplicationServices::singleton();
   char	 path[FN_REFLEN+16];
   long result= 1;
   int error_erno;
@@ -277,6 +276,7 @@
 
 bool mysql_alter_db(Session *session, const char *db, HA_CREATE_INFO *create_info)
 {
+  ReplicationServices &replication_services= ReplicationServices::singleton();
   long result=1;
   int error= 0;
   char	 path[FN_REFLEN+16];
@@ -420,6 +420,7 @@
       query= session->query;
       query_length= session->query_length;
     }
+    ReplicationServices &replication_services= ReplicationServices::singleton();
     replication_services.rawStatement(session, session->getQueryString(), session->getQueryLength());
     session->clear_error();
     session->server_status|= SERVER_STATUS_DB_DROPPED;
@@ -438,6 +439,7 @@
     query_end= query + MAX_DROP_TABLE_Q_LEN;
     db_len= strlen(db);
 
+    ReplicationServices &replication_services= ReplicationServices::singleton();
     for (tbl= dropped_tables; tbl; tbl= tbl->next_local)
     {
       uint32_t tbl_name_len;
 
=== modified file 'drizzled/definitions.h'
--- drizzled/definitions.h	2009-09-24 05:55:00 +0000
+++ drizzled/definitions.h	2009-09-30 21:30:29 +0000
@@ -329,6 +329,7 @@
 typedef uint64_t query_id_t;
 typedef void *range_seq_t;
 
+enum ha_stat_type { HA_ENGINE_STATUS, HA_ENGINE_LOGS, HA_ENGINE_MUTEX };
 // the following is for checking tables
 
 #define HA_ADMIN_ALREADY_DONE	  1
 
=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2009-09-24 06:23:51 +0000
+++ drizzled/drizzled.cc	2009-09-30 21:30:30 +0000
@@ -39,12 +39,12 @@
 #include <drizzled/session.h>
 #include <drizzled/db.h>
 #include <drizzled/item/create.h>
-#include <drizzled/errmsg.h>
 #include <drizzled/unireg.h>
-#include <drizzled/scheduling.h>
 #include "drizzled/temporal_format.h" /* For init_temporal_formats() */
-#include "drizzled/slot/listen.h"
+#include "drizzled/plugin/listen.h"
+#include "drizzled/plugin/error_message.h"
 #include "drizzled/plugin/client.h"
+#include "drizzled/plugin/scheduler.h"
 #include "drizzled/probes.h"
 
 #include <google/protobuf/stubs/common.h>
@@ -243,10 +243,10 @@
 size_t my_thread_stack_size= 65536;
 
 /*
-  Legacy global StorageEngine. These will be removed (please do not add more).
+  Legacy global plugin::StorageEngine. These will be removed (please do not add more).
 */
-StorageEngine *heap_engine;
-StorageEngine *myisam_engine;
+plugin::StorageEngine *heap_engine;
+plugin::StorageEngine *myisam_engine;
 
 char* opt_secure_file_priv= 0;
 
@@ -395,7 +395,7 @@
 drizzled::atomic<uint32_t> refresh_version;  /* Increments on each reload */
 
 /* Function declarations */
-bool drizzle_rm_tmp_tables(drizzled::slot::Listen &listen);
+bool drizzle_rm_tmp_tables();
 
 extern "C" pthread_handler_t signal_hand(void *arg);
 static void drizzle_init_variables(void);
@@ -419,10 +419,8 @@
 
 void close_connections(void)
 {
-  plugin::Registry &plugins= plugin::Registry::singleton();
-
   /* Abort listening to new connections */
-  plugins.listen.shutdown();
+  plugin::Listen::shutdown();
 
   /* kill connection thread */
   (void) pthread_mutex_lock(&LOCK_thread_count);
@@ -1391,7 +1389,7 @@
     scheduler_name= opt_scheduler_default;
   }
 
-  if (set_scheduler_factory(scheduler_name))
+  if (plugin::SchedulerFactory::setFactory(scheduler_name))
   {
       errmsg_printf(ERRMSG_LVL_ERROR,
                    _("No scheduler found, cannot continue!\n"));
@@ -1411,8 +1409,8 @@
   */
   const std::string myisam_engine_name("MyISAM");
   const std::string heap_engine_name("MEMORY");
-  myisam_engine= ha_resolve_by_name(NULL, myisam_engine_name);
-  heap_engine= ha_resolve_by_name(NULL, heap_engine_name);
+  myisam_engine= plugin::StorageEngine::findByName(NULL, myisam_engine_name);
+  heap_engine= plugin::StorageEngine::findByName(NULL, heap_engine_name);
 
   /*
     Check that the default storage engine is actually available.
@@ -1420,9 +1418,9 @@
   if (default_storage_engine_str)
   {
     const std::string name(default_storage_engine_str);
-    StorageEngine *engine;
+    plugin::StorageEngine *engine;
 
-    engine= ha_resolve_by_name(0, name);
+    engine= plugin::StorageEngine::findByName(0, name);
     if (engine == NULL)
     {
       errmsg_printf(ERRMSG_LVL_ERROR, _("Unknown/unsupported table type: %s"),
@@ -1539,7 +1537,7 @@
 
   set_default_port();
 
-  if (plugins.listen.setup())
+  if (plugin::Listen::setup())
     unireg_abort(1);
 
   /*
@@ -1548,7 +1546,7 @@
   */
   error_handler_hook= my_message_sql;
 
-  if (drizzle_rm_tmp_tables(plugins.listen) ||
+  if (drizzle_rm_tmp_tables() ||
       my_tz_init((Session *)0, default_tz_name))
   {
     abort_loop= true;
@@ -1569,7 +1567,7 @@
   /* Listen for new connections and start new session for each connection
      accepted. The listen.getClient() method will return NULL when the server
      should be shutdown. */
-  while ((client= plugins.listen.getClient()) != NULL)
+  while ((client= plugin::Listen::getClient()) != NULL)
   {
     if (!(session= new Session(client)))
     {
@@ -2409,7 +2407,7 @@
   /* Don't print warnings for --loose options during bootstrap */
   if (level == ERROR_LEVEL || global_system_variables.log_warnings)
   {
-    errmsg_vprintf (current_session, ERROR_LEVEL, format, args);
+    plugin::ErrorMessage::vprintf(current_session, ERROR_LEVEL, format, args);
   }
   va_end(args);
 }
 
=== removed file 'drizzled/errmsg.h'
--- drizzled/errmsg.h	2009-05-11 17:50:22 +0000
+++ drizzled/errmsg.h	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef DRIZZLED_ERRMSG_H
-#define DRIZZLED_ERRMSG_H
-
-#include <drizzled/plugin/error_message_handler.h>
-
-// need stdarg for va_list
-#include <stdarg.h>
-
-void add_errmsg_handler(Error_message_handler *handler);
-void remove_errmsg_handler(Error_message_handler *handler);
-
-bool errmsg_vprintf (Session *session, int priority, char const *format, va_list ap);
-
-#endif /* DRIZZLED_ERRMSG_H */
 
=== modified file 'drizzled/errmsg_print.cc'
--- drizzled/errmsg_print.cc	2009-07-07 09:06:29 +0000
+++ drizzled/errmsg_print.cc	2009-09-30 21:30:30 +0000
@@ -23,13 +23,16 @@
 */
 
 #include <drizzled/server_includes.h>
-#include <drizzled/errmsg.h>
+#include <drizzled/plugin/registry.h>
 #include <drizzled/errmsg_print.h>
 #include <drizzled/current_session.h>
+#include <drizzled/plugin/error_message.h>
 
 // need this for stderr
 #include <string.h>
 
+using namespace drizzled;
+
 void sql_perror(const char *message)
 {
   // is stderr threadsafe?
@@ -41,7 +44,7 @@
   bool rv;
   va_list args;
   va_start(args, format);
-  rv= errmsg_vprintf(current_session, priority, format, args);
+  rv= plugin::ErrorMessage::vprintf(current_session, priority, format, args);
   va_end(args);
   return rv;
 }
 
=== modified file 'drizzled/ha_trx_info.cc'
--- drizzled/ha_trx_info.cc	2009-03-25 08:39:58 +0000
+++ drizzled/ha_trx_info.cc	2009-09-30 21:30:30 +0000
@@ -22,8 +22,10 @@
 #include <drizzled/plugin/storage_engine.h>
 #include <drizzled/session.h>
 
+using namespace drizzled;
 
-void Ha_trx_info::register_ha(Session_TRANS *trans, StorageEngine *engine_arg)
+void Ha_trx_info::register_ha(Session_TRANS *trans,
+                              plugin::StorageEngine *engine_arg)
 {
   assert(m_flags == 0);
   assert(m_engine == NULL);
@@ -86,7 +88,7 @@
 }
 
 
-StorageEngine *Ha_trx_info::engine() const
+plugin::StorageEngine *Ha_trx_info::engine() const
 {
   assert(is_started());
   return m_engine;
 
=== modified file 'drizzled/ha_trx_info.h'
--- drizzled/ha_trx_info.h	2009-03-25 08:39:58 +0000
+++ drizzled/ha_trx_info.h	2009-09-30 21:30:30 +0000
@@ -22,7 +22,13 @@
 
 
 class Session_TRANS;
+namespace drizzled
+{
+namespace plugin
+{
 class StorageEngine;
+}
+}
 
 /**
   Either statement transaction or normal transaction - related
@@ -45,7 +51,8 @@
 {
 public:
   /** Register this storage engine in the given transaction context. */
-  void register_ha(Session_TRANS *trans, StorageEngine *engine_arg);
+  void register_ha(Session_TRANS *trans,
+                   drizzled::plugin::StorageEngine *engine_arg);
 
   /** Clear, prepare for reuse. */
   void reset();
@@ -58,7 +65,7 @@
   /** Mark this transaction read-write if the argument is read-write. */
   void coalesce_trx_with(const Ha_trx_info *stmt_trx);
   Ha_trx_info *next() const;
-  StorageEngine *engine() const;
+  drizzled::plugin::StorageEngine *engine() const;
 
 private:
   enum { TRX_READ_ONLY= 0, TRX_READ_WRITE= 1 };
@@ -69,7 +76,7 @@
     for the same storage engine, 'engine' is not-NULL only when the
     corresponding storage is a part of a transaction.
   */
-  StorageEngine *m_engine;
+  drizzled::plugin::StorageEngine *m_engine;
   /**
     Transaction flags related to this engine.
     Not-null only if this instance is a part of transaction.
 
=== modified file 'drizzled/handler.cc'
--- drizzled/handler.cc	2009-09-23 21:40:36 +0000
+++ drizzled/handler.cc	2009-09-30 21:30:30 +0000
@@ -44,8 +44,6 @@
 using namespace std;
 using namespace drizzled;
 
-extern drizzled::ReplicationServices replication_services;
-
 KEY_CREATE_INFO default_key_create_info= { HA_KEY_ALG_UNDEF, 0, {NULL,0} };
 
 /* number of entries in storage_engines[] */
@@ -365,7 +363,7 @@
   in each engine independently. The two-phase commit protocol
   is used only if:
   - all participating engines support two-phase commit (provide
-    StorageEngine::prepare PSEA API call) and
+    plugin::StorageEngine::prepare PSEA API call) and
   - transactions in at least two engines modify data (i.e. are
   not read-only).
 
@@ -429,10 +427,10 @@
 
   At the end of a statement, server call
   ha_autocommit_or_rollback() is invoked. This call in turn
-  invokes StorageEngine::prepare() for every involved engine.
-  Prepare is followed by a call to StorageEngine::commit_one_phase()
-  If a one-phase commit will suffice, StorageEngine::prepare() is not
-  invoked and the server only calls StorageEngine::commit_one_phase().
+  invokes plugin::StorageEngine::prepare() for every involved engine.
+  Prepare is followed by a call to plugin::StorageEngine::commit_one_phase()
+  If a one-phase commit will suffice, plugin::StorageEngine::prepare() is not
+  invoked and the server only calls plugin::StorageEngine::commit_one_phase().
   At statement commit, the statement-related read-write engine
   flag is propagated to the corresponding flag in the normal
   transaction.  When the commit is complete, the list of registered
@@ -491,7 +489,7 @@
     times per transaction.
 
 */
-void trans_register_ha(Session *session, bool all, StorageEngine *engine)
+void trans_register_ha(Session *session, bool all, plugin::StorageEngine *engine)
 {
   Session_TRANS *trans;
   Ha_trx_info *ha_info;
@@ -623,7 +621,7 @@
       for (; ha_info && !error; ha_info= ha_info->next())
       {
         int err;
-        StorageEngine *engine= ha_info->engine();
+        plugin::StorageEngine *engine= ha_info->engine();
         /*
           Do not call two-phase commit if this particular
           transaction is read-only. This allows for simpler
@@ -672,7 +670,7 @@
     for (; ha_info; ha_info= ha_info_next)
     {
       int err;
-      StorageEngine *engine= ha_info->engine();
+      plugin::StorageEngine *engine= ha_info->engine();
       if ((err= engine->commit(session, all)))
       {
         my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
@@ -715,7 +713,7 @@
     for (; ha_info; ha_info= ha_info_next)
     {
       int err;
-      StorageEngine *engine= ha_info->engine();
+      plugin::StorageEngine *engine= ha_info->engine();
       if ((err= engine->rollback(session, all)))
       { // cannot happen
         my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
@@ -847,7 +845,7 @@
   for (ha_info= sv->ha_list; ha_info; ha_info= ha_info->next())
   {
     int err;
-    StorageEngine *engine= ha_info->engine();
+    plugin::StorageEngine *engine= ha_info->engine();
     assert(engine);
     if ((err= engine->savepoint_rollback(session,
                                          (void *)(sv+1))))
@@ -866,7 +864,7 @@
        ha_info= ha_info_next)
   {
     int err;
-    StorageEngine *engine= ha_info->engine();
+    plugin::StorageEngine *engine= ha_info->engine();
     if ((err= engine->rollback(session, !(0))))
     { // cannot happen
       my_error(ER_ERROR_DURING_ROLLBACK, MYF(0), err);
@@ -894,7 +892,7 @@
   for (; ha_info; ha_info= ha_info->next())
   {
     int err;
-    StorageEngine *engine= ha_info->engine();
+    plugin::StorageEngine *engine= ha_info->engine();
     assert(engine);
 #ifdef NOT_IMPLEMENTED /*- TODO (examine this againt the original code base) */
     if (! engine->savepoint_set)
@@ -927,7 +925,7 @@
   for (; ha_info; ha_info= ha_info->next())
   {
     int err;
-    StorageEngine *engine= ha_info->engine();
+    plugin::StorageEngine *engine= ha_info->engine();
     /* Savepoint life time is enclosed into transaction life time. */
     assert(engine);
     if ((err= engine->savepoint_release(session,
@@ -2614,7 +2612,7 @@
   return false;
 }
 
-bool ha_show_status(Session *session, StorageEngine *engine, enum ha_stat_type stat)
+bool ha_show_status(Session *session, plugin::StorageEngine *engine, enum ha_stat_type stat)
 {
   List<Item> field_list;
   bool result;
@@ -2650,6 +2648,7 @@
                            const unsigned char *before_record,
                            const unsigned char *after_record)
 {
+  ReplicationServices &replication_services= ReplicationServices::singleton();
   Session *const session= table->in_use;
 
   switch (session->lex->sql_command)
 
=== modified file 'drizzled/handler.h'
--- drizzled/handler.h	2009-09-15 21:01:42 +0000
+++ drizzled/handler.h	2009-09-30 21:30:30 +0000
@@ -45,6 +45,8 @@
 #include <algorithm>
 
 #define HA_MAX_ALTER_FLAGS 40
+
+
 typedef std::bitset<HA_MAX_ALTER_FLAGS> HA_ALTER_FLAGS;
 
 extern drizzled::atomic<uint32_t> refresh_version;  /* Increments on each reload */
@@ -171,7 +173,7 @@
 
   ha_rows estimation_rows_to_insert;
 public:
-  StorageEngine *engine;      /* storage engine of this handler */
+  drizzled::plugin::StorageEngine *engine;      /* storage engine of this handler */
   unsigned char *ref;		  		/* Pointer to current row */
   unsigned char *dup_ref;			/* Pointer to duplicate row */
 
@@ -234,7 +236,7 @@
   */
   Discrete_interval auto_inc_interval_for_cur_row;
 
-  handler(StorageEngine *engine_arg, TableShare *share_arg)
+  handler(drizzled::plugin::StorageEngine *engine_arg, TableShare *share_arg)
     :table_share(share_arg), table(0),
     estimation_rows_to_insert(0), engine(engine_arg),
     ref(0), in_range_check_pushed_down(false),
@@ -803,37 +805,26 @@
 int ha_init(void);
 int ha_end(void);
 
-void add_storage_engine(StorageEngine *engine);
-void remove_storage_engine(StorageEngine *engine);
+void add_storage_engine(drizzled::plugin::StorageEngine *engine);
+void remove_storage_engine(drizzled::plugin::StorageEngine *engine);
 
-void ha_close_connection(Session* session);
-bool ha_flush_logs(StorageEngine *db_type);
-void ha_drop_database(char* path);
 int ha_create_table(Session *session, const char *path,
                     const char *db, const char *table_name,
                     HA_CREATE_INFO *create_info,
                     bool update_create_info,
                     drizzled::message::Table *table_proto);
-int ha_delete_table(Session *session, const char *path,
-                    const char *db, const char *alias, bool generate_warning);
 
 /* statistics and info */
-bool ha_show_status(Session *session, StorageEngine *db_type, enum ha_stat_type stat);
+bool ha_show_status(Session *session, drizzled::plugin::StorageEngine *db_type, enum ha_stat_type stat);
 
 int ha_find_files(Session *session,const char *db,const char *path,
                   const char *wild, bool dir, List<LEX_STRING>* files);
 
-/* report to InnoDB that control passes to the client */
-int ha_release_temporary_latches(Session *session);
-
-/* transactions: interface to StorageEngine functions */
-int ha_start_consistent_snapshot(Session *session);
-int ha_commit_or_rollback_by_xid(XID *xid, bool commit);
+/* transactions: interface to plugin::StorageEngine functions */
 int ha_commit_one_phase(Session *session, bool all);
 int ha_rollback_trans(Session *session, bool all);
-int ha_recover(HASH *commit_list);
 
-/* transactions: these functions never call StorageEngine functions directly */
+/* transactions: these functions never call plugin::StorageEngine functions directly */
 int ha_commit_trans(Session *session, bool all);
 int ha_autocommit_or_rollback(Session *session, int error);
 int ha_enable_transaction(Session *session, bool on);
@@ -844,7 +835,7 @@
 int ha_release_savepoint(Session *session, SAVEPOINT *sv);
 
 /* these are called by storage engines */
-void trans_register_ha(Session *session, bool all, StorageEngine *engine);
+void trans_register_ha(Session *session, bool all, drizzled::plugin::StorageEngine *engine);
 
 uint32_t filename_to_tablename(const char *from, char *to, uint32_t to_length);
 bool tablename_to_filename(const char *from, char *to, size_t to_length);
@@ -911,7 +902,7 @@
 bool mysql_create_like_table(Session *session, TableList *table,
                              TableList *src_table,
                              HA_CREATE_INFO *create_info);
-bool mysql_rename_table(StorageEngine *base, const char *old_db,
+bool mysql_rename_table(drizzled::plugin::StorageEngine *base, const char *old_db,
                         const char * old_name, const char *new_db,
                         const char * new_name, uint32_t flags);
 bool mysql_prepare_update(Session *session, TableList *table_list,
 
=== modified file 'drizzled/handler_structs.h'
--- drizzled/handler_structs.h	2009-09-16 20:58:28 +0000
+++ drizzled/handler_structs.h	2009-09-30 21:30:30 +0000
@@ -29,12 +29,19 @@
 #include <drizzled/lex_string.h>
 
 class Ha_trx_info;
-struct StorageEngine;
 struct st_key;
 typedef struct st_key KEY;
 struct st_key_cache;
 typedef struct st_key_cache KEY_CACHE;
 
+namespace drizzled
+{
+namespace plugin
+{
+class StorageEngine;
+}
+}
+
 struct Session_TRANS
 {
   Session_TRANS() {};
@@ -85,7 +92,7 @@
   uint32_t used_fields;
   uint32_t key_block_size;
   enum row_type row_type;
-  StorageEngine *db_type;
+  drizzled::plugin::StorageEngine *db_type;
   uint32_t options;                         /* OR of HA_CREATE_ options */
   bool table_existed;			/* 1 in create if table existed */
 } HA_CREATE_INFO;
 
=== modified file 'drizzled/item/create.cc'
--- drizzled/item/create.cc	2009-08-25 18:22:32 +0000
+++ drizzled/item/create.cc	2009-09-30 21:30:30 +0000
@@ -58,7 +58,7 @@
 #include <drizzled/function/time/weekday.h>
 
 #include <drizzled/item/cmpfunc.h>
-#include <drizzled/slot/function.h>
+#include <drizzled/plugin/function.h>
 #include <drizzled/session.h>
 
 /* Function declarations */
@@ -1459,8 +1459,7 @@
 Item*
 Create_udf_func::create(Session *session, LEX_STRING name, List<Item> *item_list)
 {
-  plugin::Registry &plugins= plugin::Registry::singleton();
-  const plugin::Function *udf= plugins.function.get(name.str, name.length);
+  const plugin::Function *udf= plugin::Function::get(name.str, name.length);
   assert(udf);
   return create(session, udf, item_list);
 }
 
=== removed file 'drizzled/logging.h'
--- drizzled/logging.h	2009-05-11 17:50:22 +0000
+++ drizzled/logging.h	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef DRIZZLED_LOGGING_H
-#define DRIZZLED_LOGGING_H
-
-#include <drizzled/plugin/logging_handler.h>
-
-/* there are no parameters other than the session because logging can
- * pull everything it needs out of the session.  If need to add
- * parameters, look at how errmsg.h and errmsg.cc do it. */
-
-bool logging_pre_do (Session *session);
-bool logging_post_do (Session *session);
-void add_logger(Logging_handler *handler);
-void remove_logger(Logging_handler *handler);
-
-#endif /* DRIZZLED_LOGGING_H */
 
=== modified file 'drizzled/plugin.h'
--- drizzled/plugin.h	2009-08-17 20:54:05 +0000
+++ drizzled/plugin.h	2009-09-30 21:30:30 +0000
@@ -22,6 +22,9 @@
 
 #include <drizzled/lex_string.h>
 #include <drizzled/xid.h>
+#include <drizzled/plugin/manifest.h>
+#include <drizzled/plugin/library.h>
+#include <drizzled/plugin/handle.h>
 
 class Session;
 class Item;
@@ -32,6 +35,14 @@
 */
 
 
+class sys_var;
+typedef struct st_mysql_lex_string LEX_STRING;
+struct my_option;
+
+extern char *opt_plugin_load;
+extern char *opt_plugin_dir_ptr;
+extern char opt_plugin_dir[FN_REFLEN];
+
 /*
   Macros for beginning and ending plugin declarations. Between
   drizzle_declare_plugin and drizzle_declare_plugin_end there should
@@ -347,7 +358,13 @@
   (*(DRIZZLE_SYSVAR_NAME(name).resolve(session, DRIZZLE_SYSVAR_NAME(name).offset)))
 
 
-struct StorageEngine;
+namespace drizzled
+{
+namespace plugin
+{
+class StorageEngine;
+}
+}
 
 
 class Plugin
@@ -402,13 +419,25 @@
 extern "C" {
 #endif
 
+extern int plugin_init(drizzled::plugin::Registry &plugins,
+                       int *argc, char **argv, int init_flags);
+extern void plugin_shutdown(drizzled::plugin::Registry &plugins);
+extern void my_print_help_inc_plugins(my_option *options);
+extern bool plugin_is_ready(const LEX_STRING *name, int type);
+extern bool mysql_install_plugin(Session *session, const LEX_STRING *name,
+                                 const LEX_STRING *dl);
+extern bool mysql_uninstall_plugin(Session *session, const LEX_STRING *name);
+extern void plugin_sessionvar_init(Session *session);
+extern void plugin_sessionvar_cleanup(Session *session);
+extern sys_var *intern_find_sys_var(const char *str, uint32_t, bool no_error);
+
 int session_in_lock_tables(const Session *session);
 int session_tablespace_op(const Session *session);
 void set_session_proc_info(Session *session, const char *info);
 const char *get_session_proc_info(Session *session);
 int64_t session_test_options(const Session *session, int64_t test_options);
 int session_sql_command(const Session *session);
-void **session_ha_data(const Session *session, const struct StorageEngine *engine);
+void **session_ha_data(const Session *session, const drizzled::plugin::StorageEngine *engine);
 int session_tx_isolation(const Session *session);
 /* Increments the row counter, see Session::row_count */
 void session_inc_row_count(Session *session);
@@ -524,7 +553,7 @@
 */
 inline
 void *
-session_get_ha_data(const Session *session, const struct StorageEngine *engine)
+session_get_ha_data(const Session *session, const drizzled::plugin::StorageEngine *engine)
 {
   return *session_ha_data(session, engine);
 }
@@ -534,7 +563,7 @@
 */
 inline
 void
-session_set_ha_data(const Session *session, const struct StorageEngine *engine,
+session_set_ha_data(const Session *session, const drizzled::plugin::StorageEngine *engine,
                 const void *ha_data)
 {
   *session_ha_data(session, engine)= (void*) ha_data;
 
=== renamed file 'drizzled/authentication.cc' => 'drizzled/plugin/authentication.cc'
--- drizzled/authentication.cc	2009-08-05 09:29:04 +0000
+++ drizzled/plugin/authentication.cc	2009-09-30 21:30:30 +0000
@@ -19,38 +19,44 @@
  */
 
 #include "drizzled/server_includes.h"
-#include "drizzled/authentication.h"
-#include "drizzled/gettext.h"
+#include "drizzled/plugin/authentication.h"
 #include "drizzled/errmsg_print.h"
 #include "drizzled/plugin/registry.h"
+#include "drizzled/gettext.h"
 
 #include <vector>
 
 using namespace std;
 
-static vector<Authentication *> all_authentication;
-
-static bool are_plugins_loaded= false;
-
-void add_authentication(Authentication *auth)
-{
-  all_authentication.push_back(auth);
-}
-
-void remove_authentication(Authentication *auth)
-{
-  all_authentication.erase(find(all_authentication.begin(),
-                                all_authentication.end(),
-                                auth));
-}
-
-class AuthenticateBy : public unary_function<Authentication *, bool>
+namespace drizzled
+{
+
+std::vector<plugin::Authentication *> all_authentication;
+bool are_plugins_loaded= false;
+
+
+bool plugin::Authentication::addPlugin(plugin::Authentication *auth)
+{
+  if (auth != NULL)
+    all_authentication.push_back(auth);
+  return false;
+}
+
+void plugin::Authentication::removePlugin(plugin::Authentication *auth)
+{
+  if (auth != NULL)
+    all_authentication.erase(find(all_authentication.begin(),
+                                  all_authentication.end(),
+                                  auth));
+}
+
+class AuthenticateBy : public unary_function<plugin::Authentication *, bool>
 {
   Session *session;
   const char *password;
 public:
   AuthenticateBy(Session *session_arg, const char *password_arg) :
-    unary_function<Authentication *, bool>(),
+    unary_function<plugin::Authentication *, bool>(),
     session(session_arg), password(password_arg) {}
 
   inline result_type operator()(argument_type auth)
@@ -59,14 +65,15 @@
   }
 };
 
-bool authenticate_user(Session *session, const char *password)
+bool plugin::Authentication::isAuthenticated(Session *session,
+                                             const char *password)
 {
   /* If we never loaded any auth plugins, just return true */
   if (are_plugins_loaded != true)
     return true;
 
   /* Use find_if instead of foreach so that we can collect return codes */
-  vector<Authentication *>::iterator iter=
+  vector<plugin::Authentication *>::iterator iter=
     find_if(all_authentication.begin(), all_authentication.end(),
             AuthenticateBy(session, password));
   /* If iter is == end() here, that means that all of the plugins returned
@@ -76,3 +83,4 @@
   return iter != all_authentication.end();
 }
 
+} /* namespace drizzled */
 
=== modified file 'drizzled/plugin/authentication.h'
--- drizzled/plugin/authentication.h	2009-05-11 17:50:22 +0000
+++ drizzled/plugin/authentication.h	2009-09-30 21:30:30 +0000
@@ -1,8 +1,7 @@
 /* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-
+ *
  *  Definitions required for Authentication plugin
-
  *
  *  Copyright (C) 2008 Sun Microsystems
  *
@@ -20,13 +19,14 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-/*
-  Definitions required for Authentication plugin
-*/
-
 #ifndef DRIZZLED_PLUGIN_AUTHENTICATION_H
 #define DRIZZLED_PLUGIN_AUTHENTICATION_H
 
+namespace drizzled
+{
+namespace plugin
+{
+
 class Authentication
 {
 public:
@@ -35,6 +35,12 @@
 
   virtual bool authenticate(Session *, const char *)= 0;
 
+  static bool addPlugin(plugin::Authentication *auth);
+  static void removePlugin(plugin::Authentication *auth);
+  static bool isAuthenticated(Session *session, const char *password);
 };
 
+} /* namespace plugin */
+} /* namespace drizzled */
+
 #endif /* DRIZZLED_PLUGIN_AUTHENTICATION_H */
 
=== added file 'drizzled/plugin/command_applier.cc'
--- drizzled/plugin/command_applier.cc	1970-01-01 00:00:00 +0000
+++ drizzled/plugin/command_applier.cc	2009-09-30 21:30:30 +0000
@@ -0,0 +1,41 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2009 Sun Microsystems
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "drizzled/global.h"
+
+#include "drizzled/replication_services.h"
+#include "drizzled/plugin/command_applier.h"
+
+using namespace std;
+using namespace drizzled;
+
+bool plugin::CommandApplier::addPlugin(plugin::CommandApplier *applier)
+{
+  ReplicationServices &replication_services= ReplicationServices::singleton();
+  /** @TODO ReplicationServices should indicate error in some way here */
+  replication_services.attachApplier(applier);
+  return false;
+}
+
+void plugin::CommandApplier::removePlugin(plugin::CommandApplier *applier)
+{
+  ReplicationServices &replication_services= ReplicationServices::singleton();
+  replication_services.detachApplier(applier);
+}
+
 
=== modified file 'drizzled/plugin/command_applier.h'
--- drizzled/plugin/command_applier.h	2009-08-10 19:07:57 +0000
+++ drizzled/plugin/command_applier.h	2009-09-30 21:30:30 +0000
@@ -32,17 +32,11 @@
  * call.
  */
 
-/* some forward declarations needed */
-namespace drizzled
-{
-  namespace message
-  {
-    class Command;
-  }
-}
-
-namespace drizzled
-{
+namespace drizzled
+{
+
+namespace message { class Command; }
+
 namespace plugin
 {
 
@@ -75,9 +69,12 @@
    * internal method for determining if it is active or not.
    */
   virtual bool isActive() {return false;}
+
+  static bool addPlugin(CommandApplier *applier);
+  static void removePlugin(CommandApplier *applier);
 };
 
-} /* end namespace drizzled::plugin */
-} /* end namespace drizzled */
+} /* namespace plugin */
+} /* namespace drizzled */
 
 #endif /* DRIZZLED_PLUGIN_APPLIER_H */
 
=== added file 'drizzled/plugin/command_replicator.cc'
--- drizzled/plugin/command_replicator.cc	1970-01-01 00:00:00 +0000
+++ drizzled/plugin/command_replicator.cc	2009-09-30 21:30:30 +0000
@@ -0,0 +1,44 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2009 Sun Microsystems
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; version 2 of the License.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "drizzled/global.h"
+
+#include "drizzled/replication_services.h"
+#include "drizzled/plugin/command_replicator.h"
+
+using namespace std;
+
+namespace drizzled
+{
+
+bool plugin::CommandReplicator::addPlugin(plugin::CommandReplicator *replicator)
+{
+  ReplicationServices &replication_services= ReplicationServices::singleton();
+  /** @TODO ReplicationServices should indicate error in some way here */
+  replication_services.attachReplicator(replicator);
+  return false;
+}
+
+void plugin::CommandReplicator::removePlugin(plugin::CommandReplicator *replicator)
+{
+  ReplicationServices &replication_services= ReplicationServices::singleton();
+  replication_services.detachReplicator(replicator);
+}
+
+}
 
=== modified file 'drizzled/plugin/command_replicator.h'
--- drizzled/plugin/command_replicator.h	2009-08-10 19:07:57 +0000
+++ drizzled/plugin/command_replicator.h	2009-09-30 21:30:30 +0000
@@ -33,17 +33,11 @@
  * An applier is responsible for applying events, not a replicator...
  */
 
-/* some forward declarations needed */
-namespace drizzled
-{
-  namespace message
-  {
-    class Command;
-  }
-}
-
-namespace drizzled
-{
+
+namespace drizzled
+{
+namespace message { class Command; }
+
 namespace plugin
 {
 
@@ -80,9 +74,12 @@
    * internal method for determining if it is active or not.
    */
   virtual bool isActive() {return false;}
+
+  static bool addPlugin(CommandReplicator *replicator);
+  static void removePlugin(CommandReplicator *replicator);
 };
 
-} /* end namespace drizzled::plugin */
-} /* end namespace drizzled */
+} /* namespace plugin */
+} /* namespace drizzled */
 
 #endif /* DRIZZLED_PLUGIN_COMMAND_REPLICATOR_H */
 
=== renamed file 'drizzled/errmsg.cc' => 'drizzled/plugin/error_message.cc'
--- drizzled/errmsg.cc	2009-08-05 09:29:04 +0000
+++ drizzled/plugin/error_message.cc	2009-09-30 21:30:30 +0000
@@ -17,48 +17,53 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <drizzled/server_includes.h>
-#include <drizzled/errmsg.h>
-#include <drizzled/gettext.h>
+#include "drizzled/server_includes.h"
+#include "drizzled/plugin/error_message.h"
 #include "drizzled/plugin/registry.h"
 
+#include "drizzled/gettext.h"
+
 #include <vector>
 
 using namespace std;
 
-static vector<Error_message_handler *> all_errmsg_handler;
-
-static bool errmsg_has= false;
-
-void add_errmsg_handler(Error_message_handler *handler)
+namespace drizzled
+{
+
+vector<plugin::ErrorMessage *> all_errmsg_handler;
+bool errmsg_has= false;
+
+
+bool plugin::ErrorMessage::addPlugin(plugin::ErrorMessage *handler)
 {
   all_errmsg_handler.push_back(handler);
   errmsg_has= true;
+  return false;
 }
 
-void remove_errmsg_handler(Error_message_handler *handler)
+void plugin::ErrorMessage::removePlugin(plugin::ErrorMessage *handler)
 {
   all_errmsg_handler.erase(find(all_errmsg_handler.begin(),
                                 all_errmsg_handler.end(), handler));
 }
 
 
-class ErrorMessagePrint : public unary_function<Error_message_handler *, bool>
+class Print : public unary_function<plugin::ErrorMessage *, bool>
 {
   Session *session;
   int priority;
   const char *format;
   va_list ap;
 public:
-  ErrorMessagePrint(Session *session_arg, int priority_arg,
-                    const char *format_arg, va_list ap_arg) :
-    unary_function<Error_message_handler *, bool>(), session(session_arg),
-    priority(priority_arg), format(format_arg)
+  Print(Session *session_arg, int priority_arg,
+        const char *format_arg, va_list ap_arg)
+    : unary_function<plugin::ErrorMessage *, bool>(), session(session_arg),
+      priority(priority_arg), format(format_arg)
     {
       va_copy(ap, ap_arg);
     }
 
-  ~ErrorMessagePrint()  { va_end(ap); }
+  ~Print()  { va_end(ap); }
 
   inline result_type operator()(argument_type handler)
   {
@@ -76,10 +81,11 @@
     }
     return false;
   }
-};
-
-bool errmsg_vprintf (Session *session, int priority,
-                     char const *format, va_list ap)
+}; 
+
+
+bool plugin::ErrorMessage::vprintf(Session *session, int priority,
+                                 char const *format, va_list ap)
 {
 
   /* check to see if any errmsg plugin has been loaded
@@ -95,9 +101,9 @@
   }
 
   /* Use find_if instead of foreach so that we can collect return codes */
-  vector<Error_message_handler *>::iterator iter=
+  vector<plugin::ErrorMessage *>::iterator iter=
     find_if(all_errmsg_handler.begin(), all_errmsg_handler.end(),
-            ErrorMessagePrint(session, priority, format, ap)); 
+            Print(session, priority, format, ap)); 
   /* If iter is == end() here, that means that all of the plugins returned
    * false, which in this case means they all succeeded. Since we want to 
    * return false on success, we return the value of the two being != 
@@ -105,4 +111,4 @@
   return iter != all_errmsg_handler.end();
 }
 
-
+} /* namespace drizzled */
 
=== renamed file 'drizzled/plugin/error_message_handler.h' => 'drizzled/plugin/error_message.h'
--- drizzled/plugin/error_message_handler.h	2009-05-11 17:50:22 +0000
+++ drizzled/plugin/error_message.h	2009-09-30 21:30:30 +0000
@@ -1,9 +1,8 @@
-/*
- -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-
+ *
  *  Definitions required for Error Message plugin
-
+ *
  *  Copyright (C) 2008 Sun Microsystems
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -20,24 +19,37 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef DRIZZLED_PLUGIN_ERRMSG_H
-#define DRIZZLED_PLUGIN_ERRMSG_H
+#ifndef DRIZZLED_PLUGIN_ERROR_MESSAGE_H
+#define DRIZZLED_PLUGIN_ERROR_MESSAGE_H
 
 #include <stdarg.h>
 #include <string>
 
-class Error_message_handler
+namespace drizzled
+{
+namespace plugin
+{
+
+class ErrorMessage
 {
   std::string name;
 public:
-  Error_message_handler(std::string name_arg): name(name_arg) {}
-  Error_message_handler(const char *name_arg): name(name_arg) {}
-  virtual ~Error_message_handler() {}
+  ErrorMessage(std::string name_arg): name(name_arg) {}
+  virtual ~ErrorMessage() {}
 
   std::string getName() { return name; }
 
   virtual bool errmsg(Session *session, int priority,
                       const char *format, va_list ap)=0;
+
+  static bool addPlugin(plugin::ErrorMessage *handler);
+  static void removePlugin(plugin::ErrorMessage *handler);
+
+  static bool vprintf(Session *session, int priority, char const *format,
+                      va_list ap);
 };
 
-#endif /* DRIZZLED_PLUGIN_ERRMSG_H */
+} /* namespace plugin */
+} /* namespace drizzled */
+
+#endif /* DRIZZLED_PLUGIN_ERROR_MESSAGE_H */
 
=== renamed file 'drizzled/slot/function.cc' => 'drizzled/plugin/function.cc'
--- drizzled/slot/function.cc	2009-08-17 20:54:05 +0000
+++ drizzled/plugin/function.cc	2009-09-30 21:30:30 +0000
@@ -17,25 +17,36 @@
 #include <drizzled/server_includes.h>
 #include <drizzled/gettext.h>
 #include <drizzled/registry.h>
-#include "drizzled/slot/function.h"
+#include "drizzled/plugin/function.h"
 
 using namespace std;
-using namespace drizzled;
-
-
-const plugin::Function *slot::Function::get(const char *name, size_t length) const
+
+namespace drizzled
+{
+
+Registry<const plugin::Function *> udf_registry;
+
+bool plugin::Function::addPlugin(const plugin::Function *udf)
+{
+  if (udf_registry.add(udf))
+  {
+    errmsg_printf(ERRMSG_LVL_ERROR,
+                  _("Could not add Function!"));
+    return true;
+  }
+  return false;
+}
+
+
+void plugin::Function::removePlugin(const plugin::Function *udf)
+{
+  udf_registry.remove(udf);
+}
+
+
+const plugin::Function *plugin::Function::get(const char *name, size_t length)
 {
   return udf_registry.find(name, length);
 }
 
-void slot::Function::add(const plugin::Function *udf)
-{
-  udf_registry.add(udf);
-}
-
-void slot::Function::remove(const plugin::Function *udf)
-{
-  udf_registry.remove(udf);
-}
-
-
+} /* namespace drizzled */
 
=== modified file 'drizzled/plugin/function.h'
--- drizzled/plugin/function.h	2009-08-17 20:54:05 +0000
+++ drizzled/plugin/function.h	2009-09-30 21:30:30 +0000
@@ -24,6 +24,8 @@
 #include <drizzled/item.h>
 #include <drizzled/sql_list.h>
 #include <drizzled/item/bin_string.h>
+#include "drizzled/function/func.h"
+
 
 #include <string>
 #include <vector>
@@ -62,6 +64,23 @@
   {
     aliases.push_back(alias);
   }
+
+  /**
+   * Add a new Function factory to the list of factories we manage.
+   */
+  static bool addPlugin(const plugin::Function *function_obj);
+
+  /**
+   * Remove a Function factory from the list of factory we manage.
+   */
+  static void removePlugin(const plugin::Function *function_obj);
+
+  /**
+   * Accept a new connection (Protocol object) on one of the configured
+   * listener interfaces.
+   */
+  static const plugin::Function *get(const char *name, size_t len=0);
+
 };
 
 template<class T>
 
=== added file 'drizzled/plugin/info_schema_table.cc'
--- drizzled/plugin/info_schema_table.cc	1970-01-01 00:00:00 +0000
+++ drizzled/plugin/info_schema_table.cc	2009-09-30 21:30:30 +0000
@@ -0,0 +1,145 @@
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+ *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
+ *
+ *  Copyright (C) 2008 Sun Microsystems
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "drizzled/server_includes.h"
+#include "drizzled/plugin/info_schema_table.h"
+#include "drizzled/gettext.h"
+#include "drizzled/session.h"
+#include "drizzled/lex_string.h"
+
+#include <vector>
+
+using namespace std;
+
+namespace drizzled
+{
+
+vector<plugin::InfoSchemaTable *> all_schema_tables;
+
+
+bool plugin::InfoSchemaTable::addPlugin(plugin::InfoSchemaTable *schema_table)
+{
+  if (schema_table->getFirstColumnIndex() == 0)
+    schema_table->setFirstColumnIndex(-1);
+  if (schema_table->getSecondColumnIndex() == 0)
+   schema_table->setSecondColumnIndex(-1);
+
+  all_schema_tables.push_back(schema_table);
+  return false;
+}
+
+void plugin::InfoSchemaTable::removePlugin(plugin::InfoSchemaTable *table)
+{
+  all_schema_tables.erase(remove_if(all_schema_tables.begin(),
+                                    all_schema_tables.end(),
+                                    bind2nd(equal_to<plugin::InfoSchemaTable *>(),
+                                            table)),
+                          all_schema_tables.end());
+}
+
+
+class AddSchemaTable : public unary_function<plugin::InfoSchemaTable *, bool>
+{
+  Session *session;
+  const char *wild;
+  vector<LEX_STRING*> &files;
+
+public:
+  AddSchemaTable(Session *session_arg, vector<LEX_STRING*> &files_arg, const char *wild_arg)
+    : session(session_arg), wild(wild_arg), files(files_arg)
+  {}
+
+  result_type operator() (argument_type schema_table)
+  {
+    if (schema_table->isHidden())
+    {
+      return false;
+    }
+
+    const string &schema_table_name= schema_table->getTableName();
+
+    if (wild && wild_case_compare(files_charset_info, schema_table_name.c_str(), wild))
+    {
+      return false;
+    }
+
+    LEX_STRING *file_name= 0;
+    file_name= session->make_lex_string(file_name, schema_table_name.c_str(),
+                                        schema_table_name.length(), true);
+    if (file_name == NULL)
+    {
+      return true;
+    }
+
+    files.push_back(file_name);
+    return false;
+  }
+};
+
+class FindSchemaTableByName : public unary_function<plugin::InfoSchemaTable *, bool>
+{
+  const char *table_name;
+public:
+  FindSchemaTableByName(const char *table_name_arg)
+    : table_name(table_name_arg) {}
+  result_type operator() (argument_type schema_table)
+  {
+    return ! my_strcasecmp(system_charset_info,
+                           schema_table->getTableName().c_str(),
+                           table_name);
+  }
+};
+
+plugin::InfoSchemaTable *plugin::InfoSchemaTable::getTable(const char *table_name)
+{
+  vector<plugin::InfoSchemaTable *>::iterator iter=
+    find_if(all_schema_tables.begin(),
+            all_schema_tables.end(),
+            FindSchemaTableByName(table_name));
+
+  if (iter != all_schema_tables.end())
+  {
+    return *iter;
+  }
+
+  return NULL;
+
+}
+
+
+int plugin::InfoSchemaTable::addTableToList(Session *session,
+                                     vector<LEX_STRING*> &files,
+                                     const char *wild)
+{
+
+  vector<plugin::InfoSchemaTable *>::iterator iter=
+    find_if(all_schema_tables.begin(),
+            all_schema_tables.end(),
+            AddSchemaTable(session, files, wild));
+
+  if (iter != all_schema_tables.end())
+  {
+    return 1;
+  }
+
+  return 0;
+}
+
+} /* namespace drizzled */
 
=== renamed file 'drizzled/info_schema.h' => 'drizzled/plugin/info_schema_table.h'
--- drizzled/info_schema.h	2009-07-07 04:47:22 +0000
+++ drizzled/plugin/info_schema_table.h	2009-09-30 21:30:30 +0000
@@ -18,11 +18,16 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef DRIZZLED_INFO_SCHEMA_H
-#define DRIZZLED_INFO_SCHEMA_H
+#ifndef DRIZZLE_PLUGIN_INFO_SCHEMA_TABLE_H
+#define DRIZZLE_PLUGIN_INFO_SCHEMA_TABLE_H
 
 #include <string>
 
+namespace drizzled
+{
+namespace plugin
+{
+
 /**
  * @file
  *   info_schema.h
@@ -471,6 +476,15 @@
    */
   InfoSchemaMethods *i_s_methods;
 
+public:
+  static bool addPlugin(plugin::InfoSchemaTable *schema_table);
+  static void removePlugin(plugin::InfoSchemaTable *table);
+
+  static plugin::InfoSchemaTable *getTable(const char *table_name);
+  static int addTableToList(Session *session, std::vector<LEX_STRING*> &files,
+                            const char *wild);
 };
 
-#endif /* DRIZZLED_INFO_SCHEMA_H */
+} /* namespace plugin */
+} /* namespace drizzled */
+#endif /* DRIZZLE_PLUGIN_INFO_SCHEMA_TABLE_H */
 
=== renamed file 'drizzled/slot/listen.cc' => 'drizzled/plugin/listen.cc'
--- drizzled/slot/listen.cc	2009-08-28 00:07:54 +0000
+++ drizzled/plugin/listen.cc	2009-09-30 21:30:30 +0000
@@ -20,7 +20,7 @@
 #include <drizzled/server_includes.h>
 #include <drizzled/gettext.h>
 #include <drizzled/error.h>
-#include <drizzled/slot/listen.h>
+#include <drizzled/plugin/listen.h>
 #include <drizzled/plugin/listen.h>
 #include <drizzled/plugin/null_client.h>
 
@@ -29,32 +29,27 @@
 using namespace std;
 using namespace drizzled;
 
-slot::Listen::Listen():
-  fd_list(NULL),
-  fd_count(0)
-{
-}
-
-slot::Listen::~Listen()
-{
-  if (fd_list != NULL)
-    free(fd_list);
-}
-
-void slot::Listen::add(plugin::Listen &listen_obj)
-{
-  listen_list.push_back(&listen_obj);
-}
-
-void slot::Listen::remove(plugin::Listen &listen_obj)
-{
-  listen_list.erase(::std::remove(listen_list.begin(),
-                                  listen_list.end(),
-                                  &listen_obj),
+std::vector<plugin::Listen *> listen_list;
+std::vector<plugin::Listen *> listen_fd_list;
+struct pollfd *fd_list= NULL;
+uint32_t fd_count= 0;
+int wakeup_pipe[2];
+
+bool plugin::Listen::addPlugin(plugin::Listen *listen_obj)
+{
+  listen_list.push_back(listen_obj);
+  return false;
+}
+
+void plugin::Listen::removePlugin(plugin::Listen *listen_obj)
+{
+  listen_list.erase(remove(listen_list.begin(),
+                           listen_list.end(),
+                           listen_obj),
                     listen_list.end());
 }
 
-bool slot::Listen::setup(void)
+bool plugin::Listen::setup(void)
 {
   vector<plugin::Listen *>::iterator it;
   struct pollfd *tmp_fd_list;
@@ -121,7 +116,7 @@
   return false;
 }
 
-plugin::Client *slot::Listen::getClient(void) const
+plugin::Client *plugin::Listen::getClient(void)
 {
   int ready;
   uint32_t x;
@@ -173,12 +168,12 @@
   }
 }
 
-plugin::Client *slot::Listen::getNullClient(void) const
+plugin::Client *plugin::Listen::getNullClient(void)
 {
   return new plugin::NullClient();
 }
 
-void slot::Listen::shutdown(void)
+void plugin::Listen::shutdown(void)
 {
   ssize_t ret= write(wakeup_pipe[1], "\0", 1);
   assert(ret == 1);
 
=== modified file 'drizzled/plugin/listen.h'
--- drizzled/plugin/listen.h	2009-08-27 07:26:22 +0000
+++ drizzled/plugin/listen.h	2009-09-30 21:30:30 +0000
@@ -53,9 +53,41 @@
    * @param[in] fd File descriptor that had activity.
    */
   virtual drizzled::plugin::Client *getClient(int fd)= 0;
+
+  /**
+   * Add a new Listen object to the list of listeners we manage.
+   */
+  static bool addPlugin(Listen *listen_obj);
+
+  /**
+   * Remove a Listen object from the list of listeners we manage.
+   */
+  static void removePlugin(Listen *listen_obj);
+
+  /**
+   * Setup all configured listen plugins.
+   */
+  static bool setup(void);
+
+  /**
+   * Accept a new connection (Client object) on one of the configured
+   * listener interfaces.
+   */
+  static plugin::Client *getClient(void);
+
+  /**
+   * Some internal functions drizzled require a temporary Client object to
+   * create a valid session object, this just returns a dummy client object.
+   */
+  static plugin::Client *getNullClient(void);
+
+  /**
+   * Shutdown and cleanup listen loop for server shutdown.
+   */
+  static void shutdown(void);
 };
 
-} /* end namespace drizzled::plugin */
-} /* end namespace drizzled */
+} /* namespace plugin */
+} /* namespace drizzled */
 
 #endif /* DRIZZLED_PLUGIN_LISTEN_H */
 
=== modified file 'drizzled/plugin/listen_tcp.cc'
--- drizzled/plugin/listen_tcp.cc	2009-08-27 18:06:03 +0000
+++ drizzled/plugin/listen_tcp.cc	2009-09-30 21:30:30 +0000
@@ -26,7 +26,9 @@
 #include <netinet/tcp.h>
 
 using namespace std;
-using namespace drizzled;
+
+namespace drizzled
+{
 
 int plugin::ListenTcp::acceptTcp(int fd)
 {
@@ -211,3 +213,5 @@
 
   return false;
 }
+
+} /* namespace drizzled */
 
=== renamed file 'drizzled/sql_plugin.cc' => 'drizzled/plugin/loader.cc'
--- drizzled/sql_plugin.cc	2009-09-14 18:25:40 +0000
+++ drizzled/plugin/loader.cc	2009-09-30 21:30:30 +0000
@@ -17,12 +17,7 @@
 #include <mysys/my_getopt.h>
 #include <mysys/hash.h>
 
-#include <drizzled/authentication.h>
-#include <drizzled/logging.h>
-#include <drizzled/errmsg.h>
-#include <drizzled/qcache.h>
 #include <drizzled/sql_parse.h>
-#include <drizzled/scheduling.h>
 #include <drizzled/replication_services.h>
 #include <drizzled/show.h>
 #include <drizzled/handler.h>
 
=== renamed file 'drizzled/logging.cc' => 'drizzled/plugin/logging.cc'
--- drizzled/logging.cc	2009-08-05 09:29:04 +0000
+++ drizzled/plugin/logging.cc	2009-09-30 21:30:30 +0000
@@ -18,7 +18,7 @@
  */
 
 #include <drizzled/server_includes.h>
-#include <drizzled/logging.h>
+#include <drizzled/plugin/logging.h>
 #include <drizzled/gettext.h>
 #include "drizzled/plugin/registry.h"
 
@@ -26,27 +26,32 @@
 
 using namespace std;
 
-static vector<Logging_handler *> all_loggers;
-
-void add_logger(Logging_handler *handler)
+namespace drizzled
+{
+
+vector<plugin::Logging *> all_loggers;
+
+
+bool plugin::Logging::addPlugin(plugin::Logging *handler)
 {
   if (handler != NULL)
     all_loggers.push_back(handler);
+  return false;
 }
 
-void remove_logger(Logging_handler *handler)
+void plugin::Logging::removePlugin(plugin::Logging *handler)
 {
   if (handler != NULL)
     all_loggers.erase(find(all_loggers.begin(), all_loggers.end(), handler));
 }
 
 
-class LoggingPreIterate : public unary_function<Logging_handler *, bool>
+class PreIterate : public unary_function<plugin::Logging *, bool>
 {
   Session *session;
 public:
-  LoggingPreIterate(Session *session_arg) :
-    unary_function<Logging_handler *, bool>(),
+  PreIterate(Session *session_arg) :
+    unary_function<plugin::Logging *, bool>(),
     session(session_arg) {}
 
   inline result_type operator()(argument_type handler)
@@ -65,12 +70,12 @@
 };
 
 
-class LoggingPostIterate : public unary_function<Logging_handler *, bool>
+class PostIterate : public unary_function<plugin::Logging *, bool>
 {
   Session *session;
 public:
-  LoggingPostIterate(Session *session_arg) :
-    unary_function<Logging_handler *, bool>(),
+  PostIterate(Session *session_arg) :
+    unary_function<plugin::Logging *, bool>(),
     session(session_arg) {}
 
   /* This gets called once for each loaded logging plugin */
@@ -90,32 +95,34 @@
 };
 
 
-/* This is the logging_pre_do entry point.
-   This gets called by the rest of the Drizzle server code */
-bool logging_pre_do (Session *session)
-{
-  /* Use find_if instead of foreach so that we can collect return codes */
-  vector<Logging_handler *>::iterator iter=
-    find_if(all_loggers.begin(), all_loggers.end(),
-            LoggingPreIterate(session)); 
-  /* If iter is == end() here, that means that all of the plugins returned
-   * false, which in this case means they all succeeded. Since we want to 
-   * return false on success, we return the value of the two being != 
-   */
-  return iter != all_loggers.end();
-}
-
-/* This is the logging_post_do entry point.
-   This gets called by the rest of the Drizzle server code */
-bool logging_post_do (Session *session)
-{
-  /* Use find_if instead of foreach so that we can collect return codes */
-  vector<Logging_handler *>::iterator iter=
-    find_if(all_loggers.begin(), all_loggers.end(),
-            LoggingPostIterate(session)); 
-  /* If iter is == end() here, that means that all of the plugins returned
-   * false, which in this case means they all succeeded. Since we want to 
-   * return false on success, we return the value of the two being != 
-   */
-  return iter != all_loggers.end();
-}
+/* This is the Logging::preDo entry point.
+   This gets called by the rest of the Drizzle server code */
+bool plugin::Logging::preDo(Session *session)
+{
+  /* Use find_if instead of foreach so that we can collect return codes */
+  vector<plugin::Logging *>::iterator iter=
+    find_if(all_loggers.begin(), all_loggers.end(),
+            PreIterate(session)); 
+  /* If iter is == end() here, that means that all of the plugins returned
+   * false, which in this case means they all succeeded. Since we want to 
+   * return false on success, we return the value of the two being != 
+   */
+  return iter != all_loggers.end();
+}
+
+/* This is the Logging::postDo entry point.
+   This gets called by the rest of the Drizzle server code */
+bool plugin::Logging::postDo(Session *session)
+{
+  /* Use find_if instead of foreach so that we can collect return codes */
+  vector<plugin::Logging *>::iterator iter=
+    find_if(all_loggers.begin(), all_loggers.end(),
+            PostIterate(session)); 
+  /* If iter is == end() here, that means that all of the plugins returned
+   * false, which in this case means they all succeeded. Since we want to 
+   * return false on success, we return the value of the two being != 
+   */
+  return iter != all_loggers.end();
+}
+
+} /* namespace drizzled */
 
=== renamed file 'drizzled/plugin/logging_handler.h' => 'drizzled/plugin/logging.h'
--- drizzled/plugin/logging_handler.h	2009-05-11 17:50:22 +0000
+++ drizzled/plugin/logging.h	2009-09-30 21:30:30 +0000
@@ -1,9 +1,8 @@
-/*
- -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
+/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
  *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
-
+ *
  *  Definitions required for Query Logging plugin
-
+ *
  *  Copyright (C) 2008 Sun Microsystems
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -25,21 +24,33 @@
 
 #include <string>
 
-class Logging_handler
+namespace drizzled
+{
+namespace plugin
+{
+
+class Logging
 {
   std::string name;
 public:
-  Logging_handler(std::string name_arg): name(name_arg)  {}
-  Logging_handler(const char *name_arg): name(name_arg)  {}
-  virtual ~Logging_handler() {}
+  Logging(std::string name_arg): name(name_arg)  {}
+  virtual ~Logging() {}
 
   std::string getName() { return name; }
   /**
    * Make these no-op rather than pure-virtual so that it's easy for a plugin
-   * to only 
+   * to only implement one.
    */
   virtual bool pre(Session *) {return false;}
   virtual bool post(Session *) {return false;}
+
+  static bool addPlugin(Logging *handler);
+  static void removePlugin(Logging *handler);
+  static bool preDo(Session *session);
+  static bool postDo(Session *session);
 };
 
+} /* namespace plugin */
+} /* namespace drizzled */
+
 #endif /* DRIZZLED_PLUGIN_LOGGING_H */
 
=== renamed file 'drizzled/qcache.cc' => 'drizzled/plugin/query_cache.cc'
--- drizzled/qcache.cc	2009-08-05 09:29:04 +0000
+++ drizzled/plugin/query_cache.cc	2009-09-30 21:30:30 +0000
@@ -17,47 +17,36 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <drizzled/server_includes.h>
-#include <drizzled/qcache.h>
-#include <drizzled/gettext.h>
+#include "drizzled/server_includes.h"
+#include "drizzled/plugin/query_cache.h"
 #include "drizzled/plugin/registry.h"
+
+#include "drizzled/gettext.h"
+
 #include <vector>
 
 using namespace std;
 
-static vector<QueryCache *> all_query_cache;
-
-void add_query_cache(QueryCache *handler)
-{
-  all_query_cache.push_back(handler);
-}
-
-void remove_query_cache(QueryCache *handler)
-{
-  all_query_cache.erase(find(all_query_cache.begin(), all_query_cache.end(),
-                        handler));
-}
-
-
+namespace drizzled
+{
+
+vector<plugin::QueryCache *> all_query_cache;
 
 /* Namespaces are here to prevent global symbol clashes with these classes */
 
-namespace drizzled {
-namespace query_cache {
-
 class TryFetchAndSendIterate
- : public unary_function<QueryCache *, bool>
+ : public unary_function<plugin::QueryCache *, bool>
 {
   Session *session;
   bool is_transactional;
 public:
   TryFetchAndSendIterate(Session *session_arg, bool is_transactional_arg) :
-    unary_function<QueryCache *, bool>(),
+    unary_function<plugin::QueryCache *, bool>(),
     session(session_arg), is_transactional(is_transactional_arg) { }
 
   inline result_type operator()(argument_type handler)
   {
-    if (handler->try_fetch_and_send(session, is_transactional))
+    if (handler->tryFetchAndSend(session, is_transactional))
     {
       errmsg_printf(ERRMSG_LVL_ERROR,
                     _("qcache plugin '%s' try_fetch_and_send() failed"),
@@ -69,13 +58,13 @@
 };
 
 class SetIterate
- : public unary_function<QueryCache *, bool>
+ : public unary_function<plugin::QueryCache *, bool>
 {
   Session *session;
   bool is_transactional;
 public:
   SetIterate(Session *session_arg, bool is_transactional_arg) :
-    unary_function<QueryCache *, bool>(),
+    unary_function<plugin::QueryCache *, bool>(),
     session(session_arg), is_transactional(is_transactional_arg) { }
 
   inline result_type operator()(argument_type handler)
@@ -92,22 +81,22 @@
 };
 
 class InvalidateTableIterate
- : public unary_function<QueryCache *, bool>
+ : public unary_function<plugin::QueryCache *, bool>
 {
   Session *session;
   bool is_transactional;
 public:
   InvalidateTableIterate(Session *session_arg, bool is_transactional_arg) :
-    unary_function<QueryCache *, bool>(),
+    unary_function<plugin::QueryCache *, bool>(),
     session(session_arg), is_transactional(is_transactional_arg) { }
 
   inline result_type operator()(argument_type handler)
   {
 
-    if (handler->invalidate_table(session, is_transactional))
+    if (handler->invalidateTable(session, is_transactional))
     {
       errmsg_printf(ERRMSG_LVL_ERROR,
-                    _("qcache plugin '%s' invalidate_table() failed"),
+                    _("qcache plugin '%s' invalidateTable() failed"),
                     handler->getName().c_str());
       return true;
     }
@@ -117,7 +106,7 @@
 
 
 class InvalidateDbIterate
- : public unary_function<QueryCache *, bool>
+ : public unary_function<plugin::QueryCache *, bool>
 {
   Session *session;
   const char *dbname;
@@ -125,16 +114,16 @@
 public:
   InvalidateDbIterate(Session *session_arg, const char *dbname_arg,
                       bool is_transactional_arg) :
-    unary_function<QueryCache *, bool>(),
+    unary_function<plugin::QueryCache *, bool>(),
     session(session_arg), dbname(dbname_arg),
     is_transactional(is_transactional_arg) { }
 
   inline result_type operator()(argument_type handler)
   {
-    if (handler->invalidate_db(session, dbname, is_transactional))
+    if (handler->invalidateDb(session, dbname, is_transactional))
     {
       errmsg_printf(ERRMSG_LVL_ERROR,
-                    _("qcache plugin '%s' invalidate_db() failed"),
+                    _("qcache plugin '%s' invalidateDb() failed"),
                     handler->getName().c_str());
       return true;
     }
@@ -143,12 +132,12 @@
 };
 
 class FlushIterate
- : public unary_function<QueryCache *, bool>
+ : public unary_function<plugin::QueryCache *, bool>
 {
   Session *session;
 public:
   FlushIterate(Session *session_arg) :
-    unary_function<QueryCache *, bool>(), session(session_arg) { }
+    unary_function<plugin::QueryCache *, bool>(), session(session_arg) { }
 
   inline result_type operator()(argument_type handler)
   {
@@ -162,23 +151,24 @@
   }
 };
 
-/*
-  Following functions:
-
-    try_fetch_and_send();
-    set();
-    invalidate_table();
-    invalidate_db();
-    flush();
-
-  are the entry points to the query cache plugin that is called by the
-  rest of the Drizzle server code.
-*/
-
-bool try_fetch_and_send(Session *session, bool transactional)
+bool plugin::QueryCache::addPlugin(plugin::QueryCache *handler)
+{
+  all_query_cache.push_back(handler);
+  return false;
+}
+
+void plugin::QueryCache::removePlugin(plugin::QueryCache *handler)
+{
+  all_query_cache.erase(find(all_query_cache.begin(), all_query_cache.end(),
+                        handler));
+}
+
+
+bool plugin::QueryCache::tryFetchAndSendDo(Session *session,
+                                           bool transactional)
 {
   /* Use find_if instead of foreach so that we can collect return codes */
-  vector<QueryCache *>::iterator iter=
+  vector<plugin::QueryCache *>::iterator iter=
     find_if(all_query_cache.begin(), all_query_cache.end(),
             TryFetchAndSendIterate(session, transactional));
   /* If iter is == end() here, that means that all of the plugins returned
@@ -188,10 +178,10 @@
   return iter != all_query_cache.end();
 }
 
-bool set(Session *session, bool transactional)
+bool plugin::QueryCache::setDo(Session *session, bool transactional)
 {
   /* Use find_if instead of foreach so that we can collect return codes */
-  vector<QueryCache *>::iterator iter=
+  vector<plugin::QueryCache *>::iterator iter=
     find_if(all_query_cache.begin(), all_query_cache.end(),
             SetIterate(session, transactional));
   /* If iter is == end() here, that means that all of the plugins returned
@@ -201,10 +191,11 @@
   return iter != all_query_cache.end();
 }
 
-bool invalidate_table(Session *session, bool transactional)
+bool plugin::QueryCache::invalidateTableDo(Session *session,
+                                         bool transactional)
 {
   /* Use find_if instead of foreach so that we can collect return codes */
-  vector<QueryCache *>::iterator iter=
+  vector<plugin::QueryCache *>::iterator iter=
     find_if(all_query_cache.begin(), all_query_cache.end(),
             InvalidateTableIterate(session, transactional));
   /* If iter is == end() here, that means that all of the plugins returned
@@ -214,11 +205,11 @@
   return iter != all_query_cache.end();
 }
 
-bool invalidate_db(Session *session, const char *dbname,
-                                         bool transactional)
+bool plugin::QueryCache::invalidateDbDo(Session *session, const char *dbname,
+                                        bool transactional)
 {
   /* Use find_if instead of foreach so that we can collect return codes */
-  vector<QueryCache *>::iterator iter=
+  vector<plugin::QueryCache *>::iterator iter=
     find_if(all_query_cache.begin(), all_query_cache.end(),
             InvalidateDbIterate(session, dbname, transactional));
   /* If iter is == end() here, that means that all of the plugins returned
@@ -228,10 +219,10 @@
   return iter != all_query_cache.end();
 }
 
-bool flush(Session *session)
+bool plugin::QueryCache::flushDo(Session *session)
 {
   /* Use find_if instead of foreach so that we can collect return codes */
-  vector<QueryCache *>::iterator iter=
+  vector<plugin::QueryCache *>::iterator iter=
     find_if(all_query_cache.begin(), all_query_cache.end(),
             FlushIterate(session));
   /* If iter is == end() here, that means that all of the plugins returned
@@ -241,6 +232,4 @@
   return iter != all_query_cache.end();
 }
 
-} /* namespace query_cache */
 } /* namespace drizzled */
-
 
=== renamed file 'drizzled/plugin/qcache.h' => 'drizzled/plugin/query_cache.h'
--- drizzled/plugin/qcache.h	2009-05-11 17:50:22 +0000
+++ drizzled/plugin/query_cache.h	2009-09-30 21:30:30 +0000
@@ -23,6 +23,11 @@
 #ifndef DRIZZLED_PLUGIN_QUERY_CACHE_H
 #define DRIZZLED_PLUGIN_QUERY_CACHE_H
 
+namespace drizzled
+{
+namespace plugin
+{
+
 /* 
   This is the API that a qcache plugin must implement.
   it should implement each of these function pointers.
@@ -43,14 +48,28 @@
 
   virtual ~QueryCache() {}
   /* Lookup the cache and transmit the data back to the client */
-  virtual bool try_fetch_and_send(Session *session,
-                                  bool is_transactional)= 0;
+  virtual bool tryFetchAndSend(Session *session,
+                               bool is_transactional)= 0;
 
   virtual bool set(Session *session, bool is_transactional)= 0;
-  virtual bool invalidate_table(Session *session, bool is_transactional)= 0;
-  virtual bool invalidate_db(Session *session, const char *db_name,
-                             bool transactional)= 0;
+  virtual bool invalidateTable(Session *session, bool is_transactional)= 0;
+  virtual bool invalidateDb(Session *session, const char *db_name,
+                            bool transactional)= 0;
   virtual bool flush(Session *session)= 0;
+
+  static bool addPlugin(QueryCache *handler);
+  static void removePlugin(QueryCache *handler);
+
+  /* These are the functions called by the rest of the Drizzle server */
+  static bool tryFetchAndSendDo(Session *session, bool transactional);
+  static bool setDo(Session *session, bool transactional);
+  static bool invalidateTableDo(Session *session, bool transactional);
+  static bool invalidateDbDo(Session *session, const char *db_name,
+                            bool transactional);
+  static bool flushDo(Session *session);
 };
 
+} /* namespace plugin */
+} /* namespace drizzled */
+
 #endif /* DRIZZLED_PLUGIN_QUERY_CACHE_H */
 
=== modified file 'drizzled/plugin/registry.cc'
--- drizzled/plugin/registry.cc	2009-09-16 17:10:18 +0000
+++ drizzled/plugin/registry.cc	2009-09-30 21:30:30 +0000
@@ -23,20 +23,15 @@
 #include "drizzled/plugin.h"
 #include "drizzled/show.h"
 #include "drizzled/handler.h"
-#include "drizzled/errmsg.h"
-#include "drizzled/authentication.h"
-#include "drizzled/qcache.h"
-#include "drizzled/scheduling.h"
-#include "drizzled/logging.h"
-#include "drizzled/replication_services.h"
 
 #include <string>
 #include <vector>
 #include <map>
 
 using namespace std;
-using namespace drizzled;
 
+namespace drizzled
+{
 
 plugin::Handle *plugin::Registry::find(const LEX_STRING *name)
 {
@@ -60,7 +55,7 @@
 }
 
 
-vector<plugin::Handle *> plugin::Registry::get_list(bool active)
+vector<plugin::Handle *> plugin::Registry::getList(bool active)
 {
   plugin::Handle *plugin= NULL;
 
@@ -82,94 +77,4 @@
   return plugins;
 }
 
-void plugin::Registry::add(StorageEngine *engine)
-{
-  add_storage_engine(engine);
-}
-
-void plugin::Registry::add(InfoSchemaTable *schema_table)
-{
-  add_infoschema_table(schema_table);
-}
-
-void plugin::Registry::add(Logging_handler *handler)
-{
-  add_logger(handler);
-}
-
-void plugin::Registry::add(Error_message_handler *handler)
-{
-  add_errmsg_handler(handler);
-}
-
-void plugin::Registry::add(Authentication *auth)
-{
-  add_authentication(auth);
-}
-
-void plugin::Registry::add(QueryCache *qcache)
-{
-  add_query_cache(qcache);
-}
-
-void plugin::Registry::add(plugin::SchedulerFactory *factory)
-{
-  add_scheduler_factory(factory);
-}
-
-
-void plugin::Registry::add(drizzled::plugin::CommandReplicator *replicator)
-{
-  add_replicator(replicator);
-}
-
-void plugin::Registry::add(drizzled::plugin::CommandApplier *applier)
-{
-  add_applier(applier);
-}
-
-void plugin::Registry::remove(StorageEngine *engine)
-{
-  remove_storage_engine(engine);
-}
-
-void plugin::Registry::remove(InfoSchemaTable *schema_table)
-{
-  remove_infoschema_table(schema_table);
-}
-
-void plugin::Registry::remove(Logging_handler *handler)
-{
-  remove_logger(handler);
-}
-
-void plugin::Registry::remove(Error_message_handler *handler)
-{
-  remove_errmsg_handler(handler);
-}
-
-void plugin::Registry::remove(Authentication *auth)
-{
-  remove_authentication(auth);
-}
-
-void plugin::Registry::remove(QueryCache *qcache)
-{
-  remove_query_cache(qcache);
-}
-
-void plugin::Registry::remove(plugin::SchedulerFactory *factory)
-{
-  remove_scheduler_factory(factory);
-}
-
-
-void plugin::Registry::remove(drizzled::plugin::CommandReplicator *replicator)
-{
-  remove_replicator(replicator);
-}
-
-void plugin::Registry::remove(drizzled::plugin::CommandApplier *applier)
-{
-  remove_applier(applier);
-}
+} /* namespace drizzled */
 
=== modified file 'drizzled/plugin/registry.h'
--- drizzled/plugin/registry.h	2009-09-16 20:04:11 +0000
+++ drizzled/plugin/registry.h	2009-09-30 21:30:30 +0000
@@ -20,28 +20,18 @@
 #ifndef DRIZZLED_PLUGIN_REGISTRY_H
 #define DRIZZLED_PLUGIN_REGISTRY_H
 
-#include "drizzled/slot/function.h"
-#include "drizzled/slot/listen.h"
-
 #include <string>
 #include <vector>
 #include <map>
 
-class StorageEngine;
-class InfoSchemaTable;
-class Logging_handler;
-class Error_message_handler;
-class Authentication;
-class QueryCache;
+#include "drizzled/gettext.h"
+#include "drizzled/unireg.h"
 
 namespace drizzled
 {
 namespace plugin
 {
-class CommandReplicator;
-class CommandApplier;
 class Handle;
-class SchedulerFactory;
 
 class Registry
 {
@@ -63,30 +53,34 @@
 
   void add(Handle *plugin);
 
-  std::vector<Handle *> get_list(bool active);
-
-  void add(StorageEngine *engine);
-  void add(InfoSchemaTable *schema_table);
-  void add(Logging_handler *handler);
-  void add(Error_message_handler *handler);
-  void add(Authentication *auth);
-  void add(QueryCache *qcache);
-  void add(SchedulerFactory *scheduler);
-  void add(drizzled::plugin::CommandReplicator *replicator);
-  void add(drizzled::plugin::CommandApplier *applier);
-
-  void remove(StorageEngine *engine);
-  void remove(InfoSchemaTable *schema_table);
-  void remove(Logging_handler *handler);
-  void remove(Error_message_handler *handler);
-  void remove(Authentication *auth);
-  void remove(QueryCache *qcache);
-  void remove(SchedulerFactory *scheduler);
-  void remove(drizzled::plugin::CommandReplicator *replicator);
-  void remove(drizzled::plugin::CommandApplier *applier);
-
-  ::drizzled::slot::Function function;
-  ::drizzled::slot::Listen listen;
+  std::vector<Handle *> getList(bool active);
+
+  template<class T>
+  void add(T *plugin)
+  {
+    bool failed= T::addPlugin(plugin);
+    if (failed)
+    {
+      /* Can't use errmsg_printf here because we might be initializing the
+       * error_message plugin.
+       */
+      /**
+       * @TODO
+       * Once plugin-base-class is merged, we'll add in this statment
+       * fprintf(stderr,
+       *       _("Fatal error: Failed initializing %s plugin."),
+       *       plugin->getName().c_str());
+       */
+      unireg_abort(1);
+    }
+  }
+
+  template<class T>
+  void remove(T *plugin)
+  {
+    T::removePlugin(plugin);
+  }
+
 };
 
 } /* end namespace plugin */
 
=== renamed file 'drizzled/scheduling.cc' => 'drizzled/plugin/scheduler.cc'
--- drizzled/scheduling.cc	2009-08-05 09:29:04 +0000
+++ drizzled/plugin/scheduler.cc	2009-09-30 21:30:30 +0000
@@ -17,19 +17,21 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <drizzled/server_includes.h>
-#include <drizzled/scheduling.h>
-#include <drizzled/gettext.h>
+#include "drizzled/server_includes.h"
+#include "drizzled/plugin/scheduler.h"
 #include "drizzled/plugin/registry.h"
-#include "drizzled/registry.h"
+
+#include "drizzled/gettext.h"
 
 using namespace std;
-using namespace drizzled;
+
+namespace drizzled
+{
 
 plugin::SchedulerFactory *scheduler_factory= NULL;
 Registry<plugin::SchedulerFactory *> all_schedulers;
 
-bool add_scheduler_factory(plugin::SchedulerFactory *factory)
+bool plugin::SchedulerFactory::addPlugin(plugin::SchedulerFactory *factory)
 {
   if (all_schedulers.count(factory->getName()) != 0)
   {
@@ -44,15 +46,14 @@
 }
 
 
-bool remove_scheduler_factory(plugin::SchedulerFactory *factory)
+void plugin::SchedulerFactory::removePlugin(plugin::SchedulerFactory *factory)
 {
   scheduler_factory= NULL;
   all_schedulers.remove(factory);
-  return false;
 }
 
 
-bool set_scheduler_factory(const string& name)
+bool plugin::SchedulerFactory::setFactory(const string& name)
 {
    
   plugin::SchedulerFactory *factory= all_schedulers.find(name);
@@ -68,7 +69,7 @@
   return false;
 }
 
-plugin::Scheduler *get_thread_scheduler()
+plugin::Scheduler *plugin::SchedulerFactory::getScheduler()
 {
   assert(scheduler_factory != NULL);
   plugin::Scheduler *sched= (*scheduler_factory)();
@@ -80,3 +81,4 @@
   return sched;
 }
 
+} /* namespace drizzled */
 
=== modified file 'drizzled/plugin/scheduler.h'
--- drizzled/plugin/scheduler.h	2009-08-05 05:46:11 +0000
+++ drizzled/plugin/scheduler.h	2009-09-30 21:30:30 +0000
@@ -75,6 +75,12 @@
   {
     aliases.push_back(alias);
   }
+
+  static bool addPlugin(plugin::SchedulerFactory *factory);
+  static void removePlugin(plugin::SchedulerFactory *factory);
+  static bool setFactory(const std::string& name);
+  static plugin::Scheduler *getScheduler();
+
 };
 
 } /* end namespace drizzled::plugin */
 
=== modified file 'drizzled/plugin/storage_engine.cc'
--- drizzled/plugin/storage_engine.cc	2009-08-19 23:35:29 +0000
+++ drizzled/plugin/storage_engine.cc	2009-09-30 21:30:30 +0000
@@ -18,6 +18,19 @@
  */
 
 #include <drizzled/server_includes.h>
+
+#include CSTDINT_H
+#include <string>
+#include <vector>
+#include <algorithm>
+#include <functional>
+
+#include <google/protobuf/io/zero_copy_stream.h>
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+
+#include "mysys/my_dir.h"
+#include "mysys/hash.h"
+
 #include <drizzled/definitions.h>
 #include <drizzled/base.h>
 #include <drizzled/handler.h>
@@ -28,37 +41,24 @@
 #include <drizzled/registry.h>
 #include <drizzled/unireg.h>
 #include <drizzled/data_home.h>
+#include "drizzled/errmsg_print.h"
 #include <drizzled/plugin/registry.h>
-#include <string>
+#include "drizzled/xid.h"
 
 #include <drizzled/table_proto.h>
 
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
-
-#include <mysys/my_dir.h>
-
-#include CSTDINT_H
-
 using namespace std;
-using namespace drizzled;
-
-drizzled::Registry<StorageEngine *> all_engines;
-
-void add_storage_engine(StorageEngine *engine)
-{
-  all_engines.add(engine);
-}
-
-void remove_storage_engine(StorageEngine *engine)
-{
-  all_engines.remove(engine);
-}
-
-StorageEngine::StorageEngine(const std::string name_arg,
-                             const std::bitset<HTON_BIT_SIZE> &flags_arg,
-                             size_t savepoint_offset_arg,
-                             bool support_2pc)
+
+
+namespace drizzled
+{
+
+Registry<plugin::StorageEngine *> all_engines;
+
+plugin::StorageEngine::StorageEngine(const string name_arg,
+                                     const bitset<HTON_BIT_SIZE> &flags_arg,
+                                     size_t savepoint_offset_arg,
+                                     bool support_2pc)
     : name(name_arg), two_phase_commit(support_2pc), enabled(true),
       flags(flags_arg),
       savepoint_offset(savepoint_alloc_size),
@@ -75,12 +75,12 @@
 }
 
 
-StorageEngine::~StorageEngine()
+plugin::StorageEngine::~StorageEngine()
 {
   savepoint_alloc_size-= orig_savepoint_offset;
 }
 
-void StorageEngine::setTransactionReadWrite(Session* session)
+void plugin::StorageEngine::setTransactionReadWrite(Session* session)
 {
   Ha_trx_info *ha_info= &session->ha_data[getSlot()].ha_info[0];
   /*
@@ -102,41 +102,113 @@
 }
 
 
-/**
-  Return the default storage engine StorageEngine for thread
-
-  @param ha_default_storage_engine(session)
-  @param session         current thread
-
-  @return
-    pointer to StorageEngine
-*/
-StorageEngine *ha_default_storage_engine(Session *session)
-{
-  if (session->variables.storage_engine)
-    return session->variables.storage_engine;
-  return global_system_variables.storage_engine;
-}
-
-
-/**
-  Return the storage engine StorageEngine for the supplied name
-
-  @param session         current thread
-  @param name        name of storage engine
-
-  @return
-    pointer to storage engine plugin handle
-*/
-StorageEngine *ha_resolve_by_name(Session *session, std::string find_str)
-{
+
+int plugin::StorageEngine::renameTableImplementation(Session *,
+                                                     const char *from,
+                                                     const char *to)
+{
+  int error= 0;
+  for (const char **ext= bas_ext(); *ext ; ext++)
+  {
+    if (rename_file_ext(from, to, *ext))
+    {
+      if ((error=my_errno) != ENOENT)
+	break;
+      error= 0;
+    }
+  }
+  return error;
+}
+
+
+/**
+  Delete all files with extension from bas_ext().
+
+  @param name		Base name of table
+
+  @note
+    We assume that the handler may return more extensions than
+    was actually used for the file.
+
+  @retval
+    0   If we successfully deleted at least one file from base_ext and
+    didn't get any other errors than ENOENT
+  @retval
+    !0  Error
+*/
+int plugin::StorageEngine::deleteTableImplementation(Session *,
+                                                     const string table_path)
+{
+  int error= 0;
+  int enoent_or_zero= ENOENT;                   // Error if no file was deleted
+  char buff[FN_REFLEN];
+
+  for (const char **ext=bas_ext(); *ext ; ext++)
+  {
+    fn_format(buff, table_path.c_str(), "", *ext,
+              MY_UNPACK_FILENAME|MY_APPEND_EXT);
+    if (my_delete_with_symlink(buff, MYF(0)))
+    {
+      if ((error= my_errno) != ENOENT)
+	break;
+    }
+    else
+      enoent_or_zero= 0;                        // No error for ENOENT
+    error= enoent_or_zero;
+  }
+  return error;
+}
+
+const char *plugin::StorageEngine::checkLowercaseNames(const char *path,
+                                                       char *tmp_path)
+{
+  if (flags.test(HTON_BIT_FILE_BASED))
+    return path;
+
+  /* Ensure that table handler get path in lower case */
+  if (tmp_path != path)
+    strcpy(tmp_path, path);
+
+  /*
+    we only should turn into lowercase database/table part
+    so start the process after homedirectory
+  */
+  if (strstr(tmp_path, drizzle_tmpdir) == tmp_path)
+    my_casedn_str(files_charset_info, tmp_path + strlen(drizzle_tmpdir));
+  else
+    my_casedn_str(files_charset_info, tmp_path + drizzle_data_home_len);
+
+  return tmp_path;
+}
+
+
+bool plugin::StorageEngine::addPlugin(plugin::StorageEngine *engine)
+{
+  if (all_engines.add(engine))
+  {
+    errmsg_printf(ERRMSG_LVL_ERROR,
+                  _("Couldn't add StorageEngine"));
+    return true;
+  }
+  return false;
+}
+
+void plugin::StorageEngine::removePlugin(plugin::StorageEngine *engine)
+{
+  all_engines.remove(engine);
+}
+
+plugin::StorageEngine *plugin::StorageEngine::findByName(Session *session,
+                                                         string find_str)
+{
+  
   transform(find_str.begin(), find_str.end(),
             find_str.begin(), ::tolower);
   string default_str("default");
   if (find_str == default_str)
     return ha_default_storage_engine(session);
 
-  StorageEngine *engine= all_engines.find(find_str);
+  plugin::StorageEngine *engine= all_engines.find(find_str);
 
   if (engine && engine->is_user_selectable())
     return engine;
@@ -144,28 +216,8 @@
   return NULL;
 }
 
-
-handler *get_new_handler(TableShare *share, MEM_ROOT *alloc,
-                         StorageEngine *engine)
-{
-  handler *file;
-
-  if (engine && engine->is_enabled())
-  {
-    if ((file= engine->create(share, alloc)))
-      file->init();
-    return(file);
-  }
-  /*
-    Try the default table type
-    Here the call to current_session() is ok as we call this function a lot of
-    times but we enter this branch very seldom.
-  */
-  return(get_new_handler(share, alloc, ha_default_storage_engine(current_session)));
-}
-
 class StorageEngineCloseConnection
-  : public unary_function<StorageEngine *, void>
+  : public unary_function<plugin::StorageEngine *, void>
 {
   Session *session;
 public:
@@ -186,28 +238,28 @@
   @note
     don't bother to rollback here, it's done already
 */
-void ha_close_connection(Session* session)
+void plugin::StorageEngine::closeConnection(Session* session)
 {
   for_each(all_engines.begin(), all_engines.end(),
            StorageEngineCloseConnection(session));
 }
 
-void ha_drop_database(char* path)
+void plugin::StorageEngine::dropDatabase(char* path)
 {
   for_each(all_engines.begin(), all_engines.end(),
-           bind2nd(mem_fun(&StorageEngine::drop_database),path));
+           bind2nd(mem_fun(&plugin::StorageEngine::drop_database),path));
 }
 
-int ha_commit_or_rollback_by_xid(XID *xid, bool commit)
+int plugin::StorageEngine::commitOrRollbackByXID(XID *xid, bool commit)
 {
   vector<int> results;
   
   if (commit)
     transform(all_engines.begin(), all_engines.end(), results.begin(),
-              bind2nd(mem_fun(&StorageEngine::commit_by_xid),xid));
+              bind2nd(mem_fun(&plugin::StorageEngine::commit_by_xid),xid));
   else
     transform(all_engines.begin(), all_engines.end(), results.begin(),
-              bind2nd(mem_fun(&StorageEngine::rollback_by_xid),xid));
+              bind2nd(mem_fun(&plugin::StorageEngine::rollback_by_xid),xid));
 
   if (find_if(results.begin(), results.end(), bind2nd(equal_to<int>(),0))
          == results.end())
@@ -215,7 +267,6 @@
   return 0;
 }
 
-
 /**
   @details
   This function should be called when MySQL sends rows of a SELECT result set
@@ -234,20 +285,19 @@
   @return
     always 0
 */
-int ha_release_temporary_latches(Session *session)
+int plugin::StorageEngine::releaseTemporaryLatches(Session *session)
 {
   for_each(all_engines.begin(), all_engines.end(),
-           bind2nd(mem_fun(&StorageEngine::release_temporary_latches),session));
+           bind2nd(mem_fun(&plugin::StorageEngine::release_temporary_latches),session));
   return 0;
 }
 
-
-bool ha_flush_logs(StorageEngine *engine)
+bool plugin::StorageEngine::flushLogs(plugin::StorageEngine *engine)
 {
   if (engine == NULL)
   {
     if (find_if(all_engines.begin(), all_engines.end(),
-            mem_fun(&StorageEngine::flush_logs))
+            mem_fun(&plugin::StorageEngine::flush_logs))
           != all_engines.begin())
       return true;
   }
@@ -276,7 +326,7 @@
     in this case commit_list==0, tc_heuristic_recover == 0
     there should be no prepared transactions in this case.
 */
-class XARecover : unary_function<StorageEngine *, void>
+class XARecover : unary_function<plugin::StorageEngine *, void>
 {
   int trans_len, found_foreign_xids, found_my_xids;
   bool result;
@@ -345,10 +395,9 @@
       }
     }
   }
-
 };
 
-int ha_recover(HASH *commit_list)
+int plugin::StorageEngine::recover(HASH *commit_list)
 {
   XID *trans_list= NULL;
   int trans_len= 0;
@@ -414,13 +463,36 @@
   return(0);
 }
 
-int ha_start_consistent_snapshot(Session *session)
+int plugin::StorageEngine::startConsistentSnapshot(Session *session)
 {
   for_each(all_engines.begin(), all_engines.end(),
-           bind2nd(mem_fun(&StorageEngine::start_consistent_snapshot),session));
+           bind2nd(mem_fun(&plugin::StorageEngine::start_consistent_snapshot),
+                   session));
   return 0;
 }
 
+class StorageEngineGetTableProto: public unary_function<plugin::StorageEngine *,bool>
+{
+  const char* path;
+  message::Table *table_proto;
+  int *err;
+public:
+  StorageEngineGetTableProto(const char* path_arg,
+                             message::Table *table_proto_arg,
+                             int *err_arg)
+  :path(path_arg), table_proto(table_proto_arg), err(err_arg) {}
+
+  result_type operator() (argument_type engine)
+  {
+    int ret= engine->getTableProtoImplementation(path, table_proto);
+
+    if (ret != ENOENT)
+      *err= ret;
+
+    return *err == EEXIST;
+  }
+};
+
 static int drizzle_read_table_proto(const char* path, message::Table* table)
 {
   int fd= open(path, O_RDONLY);
@@ -443,39 +515,17 @@
   return 0;
 }
 
-class StorageEngineGetTableProto: public unary_function<StorageEngine *,bool>
-{
-  const char* path;
-  message::Table *table_proto;
-  int *err;
-public:
-  StorageEngineGetTableProto(const char* path_arg,
-                             message::Table *table_proto_arg,
-                             int *err_arg)
-  :path(path_arg), table_proto(table_proto_arg), err(err_arg) {}
-
-  result_type operator() (argument_type engine)
-  {
-    int ret= engine->getTableProtoImplementation(path, table_proto);
-
-    if (ret != ENOENT)
-      *err= ret;
-
-    return *err == EEXIST;
-  }
-};
-
 /**
   Call this function in order to give the handler the possiblity
   to ask engine if there are any new tables that should be written to disk
   or any dropped tables that need to be removed from disk
 */
-int StorageEngine::getTableProto(const char* path,
-                                 message::Table *table_proto)
+int plugin::StorageEngine::getTableProto(const char* path,
+                                         message::Table *table_proto)
 {
   int err= ENOENT;
 
-  drizzled::Registry<StorageEngine *>::iterator iter=
+  ::drizzled::Registry<plugin::StorageEngine *>::iterator iter=
     find_if(all_engines.begin(), all_engines.end(),
             StorageEngineGetTableProto(path, table_proto, &err));
   if (iter == all_engines.end())
@@ -504,60 +554,6 @@
   return err;
 }
 
-
-int StorageEngine::renameTableImplementation(Session *, const char *from, const char *to)
-{
-  int error= 0;
-  for (const char **ext= bas_ext(); *ext ; ext++)
-  {
-    if (rename_file_ext(from, to, *ext))
-    {
-      if ((error=my_errno) != ENOENT)
-	break;
-      error= 0;
-    }
-  }
-  return error;
-}
-
-
-/**
-  Delete all files with extension from bas_ext().
-
-  @param name		Base name of table
-
-  @note
-    We assume that the handler may return more extensions than
-    was actually used for the file.
-
-  @retval
-    0   If we successfully deleted at least one file from base_ext and
-    didn't get any other errors than ENOENT
-  @retval
-    !0  Error
-*/
-int StorageEngine::deleteTableImplementation(Session *, const std::string table_path)
-{
-  int error= 0;
-  int enoent_or_zero= ENOENT;                   // Error if no file was deleted
-  char buff[FN_REFLEN];
-
-  for (const char **ext=bas_ext(); *ext ; ext++)
-  {
-    fn_format(buff, table_path.c_str(), "", *ext,
-              MY_UNPACK_FILENAME|MY_APPEND_EXT);
-    if (my_delete_with_symlink(buff, MYF(0)))
-    {
-      if ((error= my_errno) != ENOENT)
-	break;
-    }
-    else
-      enoent_or_zero= 0;                        // No error for ENOENT
-    error= enoent_or_zero;
-  }
-  return error;
-}
-
 /**
   An interceptor to hijack the text of the error message without
   setting an error in the thread. We need the text to present it
@@ -590,7 +586,7 @@
 
 
 class DeleteTableStorageEngine
-  : public unary_function<StorageEngine *, void>
+  : public unary_function<plugin::StorageEngine *, void>
 {
   Session *session;
   const char *path;
@@ -621,7 +617,7 @@
       return;
 
     path= engine->checkLowercaseNames(path, tmp_path);
-    const std::string table_path(path);
+    const string table_path(path);
     int tmp_error= engine->deleteTable(session, table_path);
 
     if (tmp_error != ENOENT)
@@ -647,12 +643,14 @@
   }
 };
 
+
 /**
   This should return ENOENT if the file doesn't exists.
   The .frm file will be deleted only if we return 0 or ENOENT
 */
-int ha_delete_table(Session *session, const char *path,
-                    const char *db, const char *alias, bool generate_warning)
+int plugin::StorageEngine::deleteTable(Session *session, const char *path,
+                                       const char *db, const char *alias,
+                                       bool generate_warning)
 {
   TableShare dummy_share;
   Table dummy_table;
@@ -689,7 +687,6 @@
     dummy_share.table_name.length= strlen(alias);
     dummy_table.alias= alias;
 
-
     if(file != NULL)
     {
       file->change_table_ptr(&dummy_table, &dummy_share);
@@ -716,101 +713,22 @@
   return error;
 }
 
-/**
-  Initiates table-file and calls appropriate database-creator.
-
-  @retval
-   0  ok
-  @retval
-   1  error
-*/
-int ha_create_table(Session *session, const char *path,
-                    const char *db, const char *table_name,
-                    HA_CREATE_INFO *create_info,
-                    bool update_create_info,
-                    message::Table *table_proto)
-{
-  int error= 1;
-  Table table;
-  TableShare share(db, 0, table_name, path);
-  message::Table tmp_proto;
-
-  if (table_proto)
-  {
-    if (parse_table_proto(session, *table_proto, &share))
-      goto err;
-  }
-  else
-  {
-    table_proto= &tmp_proto;
-    if (open_table_def(session, &share))
-      goto err;
-  }
-
-  if (open_table_from_share(session, &share, "", 0, (uint32_t) READ_ALL, 0,
-                            &table, OTM_CREATE))
-    goto err;
-
-  if (update_create_info)
-    table.updateCreateInfo(create_info, table_proto);
-
-  error= share.storage_engine->createTable(session, path, &table,
-                                           create_info, table_proto);
-  table.closefrm(false);
-  if (error)
-  {
-    char name_buff[FN_REFLEN];
-    sprintf(name_buff,"%s.%s",db,table_name);
-    my_error(ER_CANT_CREATE_TABLE, MYF(ME_BELL+ME_WAITTANG), name_buff, error);
-  }
-err:
-  share.free_table_share();
-  return(error != 0);
-}
-
-
-const string ha_resolve_storage_engine_name(const StorageEngine *engine)
-{
-  return engine == NULL ? string("UNKNOWN") : engine->getName();
-}
-
-const char *StorageEngine::checkLowercaseNames(const char *path, char *tmp_path)
-{
-  if (flags.test(HTON_BIT_FILE_BASED))
-    return path;
-
-  /* Ensure that table handler get path in lower case */
-  if (tmp_path != path)
-    strcpy(tmp_path, path);
-
-  /*
-    we only should turn into lowercase database/table part
-    so start the process after homedirectory
-  */
-  if (strstr(tmp_path, drizzle_tmpdir) == tmp_path)
-    my_casedn_str(files_charset_info, tmp_path + strlen(drizzle_tmpdir));
-  else
-    my_casedn_str(files_charset_info, tmp_path + drizzle_data_home_len);
-
-  return tmp_path;
-}
-
-class DFETableNameIterator: public TableNameIteratorImplementation
+class DFETableNameIterator: public plugin::TableNameIteratorImplementation
 {
 private:
   MY_DIR *dirp;
   uint32_t current_entry;
 
 public:
-  DFETableNameIterator(const std::string &database)
-  : TableNameIteratorImplementation(database),
+  DFETableNameIterator(const string &database)
+  : plugin::TableNameIteratorImplementation(database),
     dirp(NULL),
     current_entry(-1)
     {};
 
   ~DFETableNameIterator();
 
-  int next(std::string *name);
+  int next(string *name);
 
 };
 
@@ -880,33 +798,36 @@
   }
 }
 
-TableNameIterator::TableNameIterator(const std::string &db)
+
+plugin::TableNameIterator::TableNameIterator(const string &db)
   : current_implementation(NULL), database(db)
 {
   engine_iter= all_engines.begin();
   default_implementation= new DFETableNameIterator(database);
 }
 
-TableNameIterator::~TableNameIterator()
+plugin::TableNameIterator::~TableNameIterator()
 {
   delete current_implementation;
 }
 
-int TableNameIterator::next(std::string *name)
+int plugin::TableNameIterator::next(string *name)
 {
   int err= 0;
 
 next:
   if (current_implementation == NULL)
   {
-    while(current_implementation == NULL && engine_iter != all_engines.end())
+    while(current_implementation == NULL &&
+          (engine_iter != all_engines.end()))
     {
-      StorageEngine *engine= *engine_iter;
+      plugin::StorageEngine *engine= *engine_iter;
       current_implementation= engine->tableNameIterator(database);
       engine_iter++;
     }
 
-    if (current_implementation == NULL && engine_iter == all_engines.end())
+    if (current_implementation == NULL &&
+        (engine_iter == all_engines.end()))
     {
       current_implementation= default_implementation;
     }
@@ -927,3 +848,96 @@
   return err;
 }
 
+
+} /* namespace drizzled */
+
+
+
+handler *get_new_handler(TableShare *share, MEM_ROOT *alloc,
+                         drizzled::plugin::StorageEngine *engine)
+{
+  handler *file;
+
+  if (engine && engine->is_enabled())
+  {
+    if ((file= engine->create(share, alloc)))
+      file->init();
+    return(file);
+  }
+  /*
+    Try the default table type
+    Here the call to current_session() is ok as we call this function a lot of
+    times but we enter this branch very seldom.
+  */
+  return(get_new_handler(share, alloc, ha_default_storage_engine(current_session)));
+}
+
+
+/**
+  Return the default storage engine plugin::StorageEngine for thread
+
+  @param ha_default_storage_engine(session)
+  @param session         current thread
+
+  @return
+    pointer to plugin::StorageEngine
+*/
+drizzled::plugin::StorageEngine *ha_default_storage_engine(Session *session)
+{
+  if (session->variables.storage_engine)
+    return session->variables.storage_engine;
+  return global_system_variables.storage_engine;
+}
+
+/**
+  Initiates table-file and calls appropriate database-creator.
+
+  @retval
+   0  ok
+  @retval
+   1  error
+*/
+int ha_create_table(Session *session, const char *path,
+                    const char *db, const char *table_name,
+                    HA_CREATE_INFO *create_info,
+                    bool update_create_info,
+                    drizzled::message::Table *table_proto)
+{
+  int error= 1;
+  Table table;
+  TableShare share(db, 0, table_name, path);
+  drizzled::message::Table tmp_proto;
+
+  if (table_proto)
+  {
+    if (parse_table_proto(session, *table_proto, &share))
+      goto err;
+  }
+  else
+  {
+    table_proto= &tmp_proto;
+    if (open_table_def(session, &share))
+      goto err;
+  }
+
+  if (open_table_from_share(session, &share, "", 0, (uint32_t) READ_ALL, 0,
+                            &table, OTM_CREATE))
+    goto err;
+
+  if (update_create_info)
+    table.updateCreateInfo(create_info, table_proto);
+
+  error= share.storage_engine->createTable(session, path, &table,
+                                           create_info, table_proto);
+  table.closefrm(false);
+  if (error)
+  {
+    char name_buff[FN_REFLEN];
+    sprintf(name_buff,"%s.%s",db,table_name);
+    my_error(ER_CANT_CREATE_TABLE, MYF(ME_BELL+ME_WAITTANG), name_buff, error);
+  }
+err:
+  share.free_table_share();
+  return(error != 0);
+}
+
 
=== modified file 'drizzled/plugin/storage_engine.h'
--- drizzled/plugin/storage_engine.h	2009-08-22 02:06:02 +0000
+++ drizzled/plugin/storage_engine.h	2009-09-30 21:30:30 +0000
@@ -22,7 +22,7 @@
 
 
 #include <drizzled/definitions.h>
-#include <drizzled/sql_plugin.h>
+#include <drizzled/plugin.h>
 #include <drizzled/handler_structs.h>
 #include <drizzled/message/table.pb.h>
 #include <drizzled/registry.h>
@@ -41,7 +41,6 @@
 typedef bool (stat_print_fn)(Session *session, const char *type, uint32_t type_len,
                              const char *file, uint32_t file_len,
                              const char *status, uint32_t status_len);
-enum ha_stat_type { HA_ENGINE_STATUS, HA_ENGINE_LOGS, HA_ENGINE_MUTEX };
 
 /* Possible flags of a StorageEngine (there can be 32 of them) */
 enum engine_flag_bits {
@@ -69,8 +68,15 @@
 static const std::bitset<HTON_BIT_SIZE> HTON_HAS_DATA_DICTIONARY(1 << HTON_BIT_HAS_DATA_DICTIONARY);
 
 class Table;
+
+namespace drizzled
+{
+namespace plugin
+{
+
+const std::string UNKNOWN_STRING("UNKNOWN");
+
 class TableNameIteratorImplementation;
-
 /*
   StorageEngine is a singleton structure - one instance per storage engine -
   to provide access to storage engine functionality that works on the
@@ -128,9 +134,6 @@
 
   virtual ~StorageEngine();
 
-  static int getTableProto(const char* path,
-                           drizzled::message::Table *table_proto);
-
   virtual int getTableProtoImplementation(const char* path,
                                           drizzled::message::Table *table_proto)
     {
@@ -187,7 +190,7 @@
   void enable() { enabled= true; }
   void disable() { enabled= false; }
 
-  std::string getName() const { return name; }
+  const std::string &getName() const { return name; }
 
   /*
     StorageEngine methods:
@@ -325,6 +328,29 @@
     (void)database;
     return NULL;
   }
+
+
+  static bool addPlugin(plugin::StorageEngine *engine);
+  static void removePlugin(plugin::StorageEngine *engine);
+
+  static int getTableProto(const char* path, message::Table *table_proto);
+
+  static plugin::StorageEngine *findByName(Session *session,
+                                           std::string find_str);
+  static void closeConnection(Session* session);
+  static void dropDatabase(char* path);
+  static int commitOrRollbackByXID(XID *xid, bool commit);
+  static int releaseTemporaryLatches(Session *session);
+  static bool flushLogs(plugin::StorageEngine *db_type);
+  static int recover(HASH *commit_list);
+  static int startConsistentSnapshot(Session *session);
+  static int deleteTable(Session *session, const char *path, const char *db,
+                         const char *alias, bool generate_warning);
+  static inline const std::string &resolveName(const StorageEngine *engine)
+  {
+    return engine == NULL ? UNKNOWN_STRING : engine->getName();
+  }
+
 };
 
 class TableNameIteratorImplementation
@@ -343,9 +369,9 @@
 class TableNameIterator
 {
 private:
-  drizzled::Registry<StorageEngine *>::iterator engine_iter;
-  TableNameIteratorImplementation *current_implementation;
-  TableNameIteratorImplementation *default_implementation;
+  ::drizzled::Registry<plugin::StorageEngine *>::iterator engine_iter;
+  plugin::TableNameIteratorImplementation *current_implementation;
+  plugin::TableNameIteratorImplementation *default_implementation;
   std::string database;
 public:
   TableNameIterator(const std::string &db);
@@ -354,12 +380,71 @@
   int next(std::string *name);
 };
 
+
+} /* namespace plugin */
+} /* namespace drizzled */
+
 /* lookups */
-StorageEngine *ha_default_storage_engine(Session *session);
-StorageEngine *ha_resolve_by_name(Session *session, std::string find_str);
+/**
+  Return the default storage engine plugin::StorageEngine for thread
+
+  @param ha_default_storage_engine(session)
+  @param session         current thread
+
+  @return
+    pointer to plugin::StorageEngine
+*/
+drizzled::plugin::StorageEngine *ha_default_storage_engine(Session *session);
 
 handler *get_new_handler(TableShare *share, MEM_ROOT *alloc,
-                         StorageEngine *db_type);
-const std::string ha_resolve_storage_engine_name(const StorageEngine *db_type);
+                         drizzled::plugin::StorageEngine *db_type);
+
+
+
+/** @TODO remove each of the following convenience naming methods */
+
+static inline void ha_close_connection(Session *session)
+{
+  drizzled::plugin::StorageEngine::closeConnection(session);
+}
+
+static inline void ha_drop_database(char* path)
+{
+  drizzled::plugin::StorageEngine::dropDatabase(path);
+}
+
+static inline int ha_commit_or_rollback_by_xid(XID *xid, bool commit)
+{
+  return drizzled::plugin::StorageEngine::commitOrRollbackByXID(xid, commit);
+}
+
+/* report to InnoDB that control passes to the client */
+static inline int ha_release_temporary_latches(Session *session)
+{
+  return drizzled::plugin::StorageEngine::releaseTemporaryLatches(session);
+}
+
+static inline bool ha_flush_logs(drizzled::plugin::StorageEngine *engine)
+{
+  return drizzled::plugin::StorageEngine::flushLogs(engine);
+}
+
+static inline int ha_recover(HASH *commit_list)
+{
+  return drizzled::plugin::StorageEngine::recover(commit_list);
+}
+
+static inline int ha_start_consistent_snapshot(Session *session)
+{
+  return drizzled::plugin::StorageEngine::startConsistentSnapshot(session);
+}
+
+static inline int ha_delete_table(Session *session, const char *path,
+                    const char *db, const char *alias, bool generate_warning)
+{
+  return drizzled::plugin::StorageEngine::deleteTable(session, path, db,
+                                            alias, generate_warning);
+}
+
 
 #endif /* DRIZZLED_PLUGIN_STORAGE_ENGINE_H */
 
=== removed file 'drizzled/qcache.h'
--- drizzled/qcache.h	2009-07-07 09:06:29 +0000
+++ drizzled/qcache.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef DRIZZLED_QCACHE_H
-#define DRIZZLED_QCACHE_H
-
-#include <drizzled/plugin/qcache.h>
-
-void add_query_cache(QueryCache *handler);
-void remove_query_cache(QueryCache *handler);
-
-namespace drizzled {
-namespace query_cache {
-/* These are the functions called by the rest of the Drizzle server */
-bool try_fetch_and_send(Session *session, bool transactional);
-bool set(Session *session, bool transactional);
-bool invalidate_table(Session *session, bool transactional);
-bool invalidate_db(Session *session, const char *db_name,
-                   bool transactional);
-bool flush(Session *session);
-}
-}
-
-#endif /* DRIZZLED_QCACHE_H */
 
=== modified file 'drizzled/registry.h'
--- drizzled/registry.h	2009-08-17 20:54:05 +0000
+++ drizzled/registry.h	2009-09-30 21:30:30 +0000
@@ -23,6 +23,7 @@
 #include <map>
 #include <set>
 #include <string>
+#include <vector>
 #include <algorithm>
 #include <functional>
 
 
=== modified file 'drizzled/replication_services.cc'
--- drizzled/replication_services.cc	2009-09-16 17:10:18 +0000
+++ drizzled/replication_services.cc	2009-09-30 21:30:30 +0000
@@ -49,35 +49,12 @@
 #include "drizzled/message/table.pb.h"
 #include "drizzled/gettext.h"
 #include "drizzled/session.h"
-#include "drizzled/plugin/registry.h"
 
 #include <vector>
 
 using namespace std;
 using namespace drizzled;
 
-ReplicationServices replication_services;
-
-void add_replicator(plugin::CommandReplicator *replicator)
-{
-  replication_services.attachReplicator(replicator);
-}
-
-void remove_replicator(plugin::CommandReplicator *replicator)
-{
-  replication_services.detachReplicator(replicator);
-}
-
-void add_applier(plugin::CommandApplier *applier)
-{
-  replication_services.attachApplier(applier);
-}
-
-void remove_applier(plugin::CommandApplier *applier)
-{
-  replication_services.detachApplier(applier);
-}
-
 ReplicationServices::ReplicationServices()
 {
   is_active= false;
 
=== modified file 'drizzled/replication_services.h'
--- drizzled/replication_services.h	2009-07-29 09:19:15 +0000
+++ drizzled/replication_services.h	2009-09-30 21:30:30 +0000
@@ -42,21 +42,13 @@
   {
     class Command;
   }
-}
-
-void add_replicator(drizzled::plugin::CommandReplicator *replicator);
-void remove_replicator(drizzled::plugin::CommandReplicator *replicator);
-
-void add_applier(drizzled::plugin::CommandApplier *applier);
-void remove_applier(drizzled::plugin::CommandApplier *applier);
+
 
 /**
  * This is a class which manages transforming internal 
  * transactional events into GPB messages and sending those
  * events out through registered replicators and appliers.
  */
-namespace drizzled
-{
 class ReplicationServices
 {
 public:
@@ -103,6 +95,17 @@
    * Constructor
    */
   ReplicationServices();
+
+  /**
+   * Singleton method
+   * Returns the singleton instance of ReplicationServices
+   */
+  static inline ReplicationServices &singleton()
+  {
+    static ReplicationServices replication_services;
+    return replication_services;
+  }
+
   /**
    * Returns whether the ReplicationServices object
    * is active.  In other words, does it have both
 
=== removed file 'drizzled/scheduling.h'
--- drizzled/scheduling.h	2009-08-04 22:16:30 +0000
+++ drizzled/scheduling.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef DRIZZLED_SCHEDULING_H
-#define DRIZZLED_SCHEDULING_H
-
-#include <drizzled/plugin/scheduler.h>
-
-#include <string>
-
-drizzled::plugin::Scheduler *get_thread_scheduler();
-bool add_scheduler_factory(drizzled::plugin::SchedulerFactory *scheduler);
-bool remove_scheduler_factory(drizzled::plugin::SchedulerFactory *scheduler);
-bool set_scheduler_factory(const std::string& name);
-
-#endif /* DRIZZLED_SCHEDULING_H */
 
=== modified file 'drizzled/server_includes.h'
--- drizzled/server_includes.h	2009-09-22 07:35:28 +0000
+++ drizzled/server_includes.h	2009-09-30 21:30:30 +0000
@@ -37,8 +37,6 @@
 /* Custom C string functions */
 #include <mystrings/m_string.h>
 
-/* The <strong>INTERNAL</strong> plugin API - not the external, or public, server plugin API */
-#include <drizzled/sql_plugin.h>
 /* Range optimization API/library */
 #include <drizzled/opt_range.h>
 /* Routines for dropping, repairing, checking schema tables */
@@ -150,8 +148,8 @@
 extern struct my_option my_long_options[];
 extern std::bitset<5> sql_command_flags[];
 
-extern StorageEngine *myisam_engine;
-extern StorageEngine *heap_engine;
+extern drizzled::plugin::StorageEngine *myisam_engine;
+extern drizzled::plugin::StorageEngine *heap_engine;
 
 extern SHOW_COMP_OPTION have_symlink;
 
 
=== renamed directory 'drizzled/slot' => 'drizzled/service'
=== modified file 'drizzled/session.cc'
--- drizzled/session.cc	2009-09-26 02:16:50 +0000
+++ drizzled/session.cc	2009-09-30 21:30:30 +0000
@@ -36,8 +36,9 @@
 #include <drizzled/item/return_int.h>
 #include <drizzled/item/empty_string.h>
 #include <drizzled/show.h>
-#include <drizzled/scheduling.h>
 #include <drizzled/plugin/client.h>
+#include "drizzled/plugin/scheduler.h"
+#include "drizzled/plugin/authentication.h"
 #include "drizzled/probes.h"
 
 #include <algorithm>
@@ -144,7 +145,7 @@
 }
 
 extern "C"
-void **session_ha_data(const Session *session, const struct StorageEngine *engine)
+void **session_ha_data(const Session *session, const plugin::StorageEngine *engine)
 {
   return (void **) &session->ha_data[engine->slot].ha_ptr;
 }
@@ -608,7 +609,7 @@
 
 bool Session::schedule()
 {
-  scheduler= get_thread_scheduler();
+  scheduler= plugin::SchedulerFactory::getScheduler();
 
   ++connection_count;
 
@@ -670,7 +671,7 @@
     return false;
   }
 
-  is_authenticated= authenticate_user(this, passwd);
+  is_authenticated= plugin::Authentication::isAuthenticated(this, passwd);
 
   if (is_authenticated != true)
   {
@@ -1925,7 +1926,7 @@
 
 void Session::close_temporary(Table *table, bool free_share, bool delete_table)
 {
-  StorageEngine *table_type= table->s->db_type();
+  plugin::StorageEngine *table_type= table->s->db_type();
 
   table->free_io_cache();
   table->closefrm(false);
@@ -2151,7 +2152,7 @@
   return false;
 }
 
-bool Session::rm_temporary_table(StorageEngine *base, char *path)
+bool Session::rm_temporary_table(plugin::StorageEngine *base, char *path)
 {
   bool error=0;
 
 
=== modified file 'drizzled/session.h'
--- drizzled/session.h	2009-09-26 02:16:50 +0000
+++ drizzled/session.h	2009-09-30 21:30:30 +0000
@@ -23,7 +23,7 @@
 
 /* Classes in mysql */
 
-#include <drizzled/sql_plugin.h>
+#include "drizzled/plugin.h"
 #include <drizzled/sql_locale.h>
 #include <drizzled/ha_trx_info.h>
 #include <mysys/my_alloc.h>
@@ -33,7 +33,6 @@
 #include <drizzled/sql_error.h>
 #include <drizzled/file_exchange.h>
 #include <drizzled/select_result_interceptor.h>
-#include <drizzled/authentication.h>
 #include <drizzled/db.h>
 #include <drizzled/xid.h>
 
@@ -170,7 +169,7 @@
   /* TODO: change this to my_thread_id - but have to fix set_var first */
   uint64_t pseudo_thread_id;
 
-  StorageEngine *storage_engine;
+  drizzled::plugin::StorageEngine *storage_engine;
 
   /* Only charset part of these variables is sensible */
   const CHARSET_INFO  *character_set_filesystem;
@@ -1410,7 +1409,7 @@
   void close_temporary_table(Table *table, bool free_share, bool delete_table);
   void close_temporary(Table *table, bool free_share, bool delete_table);
   int drop_temporary_table(TableList *table_list);
-  bool rm_temporary_table(StorageEngine *base, char *path);
+  bool rm_temporary_table(drizzled::plugin::StorageEngine *base, char *path);
   Table *open_temporary_table(const char *path, const char *db,
                               const char *table_name, bool link_in_list,
                               open_table_mode open_mode);
 
=== modified file 'drizzled/set_var.cc'
--- drizzled/set_var.cc	2009-09-15 02:21:15 +0000
+++ drizzled/set_var.cc	2009-09-30 21:30:30 +0000
@@ -57,13 +57,14 @@
 #include <drizzled/item/uint.h>
 #include <drizzled/item/null.h>
 #include <drizzled/item/float.h>
-#include <drizzled/sql_plugin.h>
+#include <drizzled/plugin.h>
 
 #include "drizzled/registry.h"
 #include <map>
 #include <algorithm>
 
 using namespace std;
+using namespace drizzled;
 
 extern const CHARSET_INFO *character_set_filesystem;
 extern size_t my_thread_stack_size;
@@ -2056,8 +2057,8 @@
     else
     {
       const std::string engine_name(res->ptr());
-      StorageEngine *engine;
-      var->save_result.storage_engine= ha_resolve_by_name(session, engine_name);
+      plugin::StorageEngine *engine;
+      var->save_result.storage_engine= plugin::StorageEngine::findByName(session, engine_name);
       if (var->save_result.storage_engine == NULL)
       {
         value= res->c_ptr();
@@ -2081,7 +2082,7 @@
 {
   unsigned char* result;
   string engine_name;
-  StorageEngine *engine= session->variables.*offset;
+  plugin::StorageEngine *engine= session->variables.*offset;
   if (type == OPT_GLOBAL)
     engine= global_system_variables.*offset;
   engine_name= engine->getName();
@@ -2093,7 +2094,7 @@
 
 void sys_var_session_storage_engine::set_default(Session *session, enum_var_type type)
 {
-  StorageEngine *old_value, *new_value, **value;
+  plugin::StorageEngine *old_value, *new_value, **value;
   if (type == OPT_GLOBAL)
   {
     value= &(global_system_variables.*offset);
@@ -2112,7 +2113,7 @@
 
 bool sys_var_session_storage_engine::update(Session *session, set_var *var)
 {
-  StorageEngine **value= &(global_system_variables.*offset), *old_value;
+  plugin::StorageEngine **value= &(global_system_variables.*offset), *old_value;
    if (var->type != OPT_GLOBAL)
      value= &(session->variables.*offset);
   old_value= *value;
 
=== modified file 'drizzled/set_var.h'
--- drizzled/set_var.h	2009-08-13 21:22:40 +0000
+++ drizzled/set_var.h	2009-09-30 21:30:30 +0000
@@ -656,10 +656,10 @@
 class sys_var_session_storage_engine :public sys_var_session
 {
 protected:
-  StorageEngine *SV::*offset;
+  drizzled::plugin::StorageEngine *SV::*offset;
 public:
   sys_var_session_storage_engine(sys_var_chain *chain, const char *name_arg,
-                                 StorageEngine *SV::*offset_arg)
+                                 drizzled::plugin::StorageEngine *SV::*offset_arg)
     :sys_var_session(name_arg), offset(offset_arg)
   { chain_sys_var(chain); }
   bool check(Session *session, set_var *var);
@@ -983,7 +983,7 @@
     uint32_t uint32_t_value;
     uint64_t uint64_t_value;
     size_t size_t_value;
-    StorageEngine *storage_engine;
+    drizzled::plugin::StorageEngine *storage_engine;
     Time_zone *time_zone;
     MY_LOCALE *locale_value;
   } save_result;
 
=== modified file 'drizzled/show.cc'
--- drizzled/show.cc	2009-08-31 23:50:37 +0000
+++ drizzled/show.cc	2009-09-30 21:30:30 +0000
@@ -40,7 +40,7 @@
 #include <drizzled/item/return_date_time.h>
 #include <drizzled/item/empty_string.h>
 #include "drizzled/plugin/registry.h"
-#include <drizzled/info_schema.h>
+#include <drizzled/plugin/info_schema_table.h>
 #include <drizzled/message/schema.pb.h>
 #include <drizzled/plugin/client.h>
 #include <mysys/cached_directory.h>
@@ -66,26 +66,6 @@
 
 static void store_key_options(String *packet, Table *table, KEY *key_info);
 
-static vector<InfoSchemaTable *> all_schema_tables;
-
-void add_infoschema_table(InfoSchemaTable *schema_table)
-{
-  if (schema_table->getFirstColumnIndex() == 0)
-    schema_table->setFirstColumnIndex(-1);
-  if (schema_table->getSecondColumnIndex() == 0)
-   schema_table->setSecondColumnIndex(-1);
-
-  all_schema_tables.push_back(schema_table);
-}
-
-void remove_infoschema_table(InfoSchemaTable *table)
-{
-  all_schema_tables.erase(remove_if(all_schema_tables.begin(),
-                                    all_schema_tables.end(),
-                                    bind2nd(equal_to<InfoSchemaTable *>(),
-                                            table)),
-                          all_schema_tables.end());
-}
 
 
 int wild_case_compare(const CHARSET_INFO * const cs, const char *str,const char *wildstr)
@@ -1102,7 +1082,7 @@
                              TableList *table,
                              LOOKUP_FIELD_VALUES *lookup_field_vals)
 {
-  InfoSchemaTable *schema_table= table->schema_table;
+  plugin::InfoSchemaTable *schema_table= table->schema_table;
   const char *field_name1= schema_table->getFirstColumnIndex() >= 0 ?
     schema_table->getColumnName(schema_table->getFirstColumnIndex()).c_str() : "";
   const char *field_name2= schema_table->getSecondColumnIndex() >= 0 ?
@@ -1230,7 +1210,7 @@
   {
     Item_field *item_field= (Item_field*)item;
     const CHARSET_INFO * const cs= system_charset_info;
-    InfoSchemaTable *schema_table= table->schema_table;
+    plugin::InfoSchemaTable *schema_table= table->schema_table;
     const char *field_name1= schema_table->getFirstColumnIndex() >= 0 ?
       schema_table->getColumnName(schema_table->getFirstColumnIndex()).c_str() : "";
     const char *field_name2= schema_table->getSecondColumnIndex() >= 0 ?
@@ -1463,60 +1443,6 @@
 }
 
 
-class AddSchemaTable : public unary_function<InfoSchemaTable *, bool>
-{
-  Session *session;
-  const char *wild;
-  vector<LEX_STRING*> &files;
-
-public:
-  AddSchemaTable(Session *session_arg, vector<LEX_STRING*> &files_arg, const char *wild_arg)
-    : session(session_arg), wild(wild_arg), files(files_arg)
-  {}
-
-  result_type operator() (argument_type schema_table)
-  {
-    if (schema_table->isHidden())
-    {
-      return false;
-    }
-
-    const string &schema_table_name= schema_table->getTableName();
-
-    if (wild && wild_case_compare(files_charset_info, schema_table_name.c_str(), wild))
-    {
-      return false;
-    }
-
-    LEX_STRING *file_name= 0;
-    file_name= session->make_lex_string(file_name, schema_table_name.c_str(),
-                                        schema_table_name.length(), true);
-    if (file_name == NULL)
-    {
-      return true;
-    }
-
-    files.push_back(file_name);
-    return false;
-  }
-};
-
-
-static int schema_tables_add(Session *session, vector<LEX_STRING*> &files, const char *wild)
-{
-  vector<InfoSchemaTable *>::iterator iter= find_if(all_schema_tables.begin(),
-                                                    all_schema_tables.end(),
-                                                    AddSchemaTable(session, files, wild));
-
-  if (iter != all_schema_tables.end())
-  {
-    return 1;
-  }
-
-  return 0;
-}
-
-
 /**
   @brief          Create table names list
 
@@ -1548,7 +1474,7 @@
   {
     if (with_i_schema)
     {
-      if (find_schema_table(lookup_field_vals->table_value.str))
+      if (plugin::InfoSchemaTable::getTable(lookup_field_vals->table_value.str))
       {
         table_names.push_back(&lookup_field_vals->table_value);
       }
@@ -1565,12 +1491,12 @@
     to the list
   */
   if (with_i_schema)
-    return (schema_tables_add(session, table_names,
-                              lookup_field_vals->table_value.str));
+    return plugin::InfoSchemaTable::addTableToList(session, table_names,
+                                      lookup_field_vals->table_value.str);
 
   string db(db_name->str);
 
-  TableNameIterator tniter(db);
+  plugin::TableNameIterator tniter(db);
   int err= 0;
   string table_name;
 
@@ -1622,7 +1548,7 @@
 
 static int
 fill_schema_show_cols_or_idxs(Session *session, TableList *tables,
-                              InfoSchemaTable *schema_table,
+                              plugin::InfoSchemaTable *schema_table,
                               Open_tables_state *open_tables_state_backup)
 {
   LEX *lex= session->lex;
@@ -1739,7 +1665,7 @@
 */
 
 static uint32_t get_table_open_method(TableList *tables,
-                                      InfoSchemaTable *schema_table)
+                                      plugin::InfoSchemaTable *schema_table)
 {
   /*
     determine which method will be used for table opening
@@ -1778,7 +1704,7 @@
 */
 
 static int fill_schema_table_from_frm(Session *session,TableList *tables,
-                                      InfoSchemaTable *schema_table,
+                                      plugin::InfoSchemaTable *schema_table,
                                       LEX_STRING *db_name,
                                       LEX_STRING *table_name)
 {
@@ -1832,7 +1758,7 @@
                   temporary tables that are filled at query execution time.
                   Those I_S tables whose data are retrieved
                   from frm files and storage engine are filled by the function
-                  InfoSchemaMethods::fillTable().
+                  plugin::InfoSchemaMethods::fillTable().
 
   @param[in]      session                      thread handler
   @param[in]      tables                   I_S table
@@ -1842,14 +1768,14 @@
     @retval       0                        success
     @retval       1                        error
 */
-int InfoSchemaMethods::fillTable(Session *session, TableList *tables, COND *cond)
+int plugin::InfoSchemaMethods::fillTable(Session *session, TableList *tables, COND *cond)
 {
   LEX *lex= session->lex;
   Table *table= tables->table;
   Select_Lex *old_all_select_lex= lex->all_selects_list;
   enum_sql_command save_sql_command= lex->sql_command;
   Select_Lex *lsel= tables->schema_select_lex;
-  InfoSchemaTable *schema_table= tables->schema_table;
+  plugin::InfoSchemaTable *schema_table= tables->schema_table;
   Select_Lex sel;
   LOOKUP_FIELD_VALUES lookup_field_vals;
   bool with_i_schema;
@@ -2168,7 +2094,7 @@
 }
 
 
-int InfoSchemaMethods::processTable(Session *session, TableList *tables,
+int plugin::InfoSchemaMethods::processTable(Session *session, TableList *tables,
 				    Table *table, bool res,
 				    LEX_STRING *db_name,
 				    LEX_STRING *table_name) const
@@ -2289,48 +2215,7 @@
 }
 
 
-class FindSchemaTableByName : public unary_function<InfoSchemaTable *, bool>
-{
-  const char *table_name;
-public:
-  FindSchemaTableByName(const char *table_name_arg)
-    : table_name(table_name_arg) {}
-  result_type operator() (argument_type schema_table)
-  {
-    return ! my_strcasecmp(system_charset_info,
-                           schema_table->getTableName().c_str(),
-                           table_name);
-  }
-};
-
-
-/*
-  Find schema_tables elment by name
-
-  SYNOPSIS
-    find_schema_table()
-    table_name          table name
-
-  RETURN
-    0	table not found
-    #   pointer to 'schema_tables' element
-*/
-
-InfoSchemaTable *find_schema_table(const char* table_name)
-{
-  vector<InfoSchemaTable *>::iterator iter= 
-    find_if(all_schema_tables.begin(), all_schema_tables.end(),
-            FindSchemaTableByName(table_name));
-  if (iter != all_schema_tables.end())
-  {
-    return *iter;
-  }
-
-  return NULL;
-}
-
-
-Table *InfoSchemaMethods::createSchemaTable(Session *session, TableList *table_list)
+Table *plugin::InfoSchemaMethods::createSchemaTable(Session *session, TableList *table_list)
   const
 {
   int field_count= 0;
@@ -2338,12 +2223,12 @@
   Table *table;
   List<Item> field_list;
   const CHARSET_INFO * const cs= system_charset_info;
-  const InfoSchemaTable::Columns &columns= table_list->schema_table->getColumns();
-  InfoSchemaTable::Columns::const_iterator iter= columns.begin();
+  const plugin::InfoSchemaTable::Columns &columns= table_list->schema_table->getColumns();
+  plugin::InfoSchemaTable::Columns::const_iterator iter= columns.begin();
 
   while (iter != columns.end())
   {
-    const ColumnInfo *column= *iter;
+    const plugin::ColumnInfo *column= *iter;
     switch (column->getType()) {
     case DRIZZLE_TYPE_LONG:
     case DRIZZLE_TYPE_LONGLONG:
@@ -2435,7 +2320,7 @@
   Make list of fields for SHOW
 
   SYNOPSIS
-    InfoSchemaMethods::oldFormat()
+    plugin::InfoSchemaMethods::oldFormat()
     session			thread handler
     schema_table        pointer to 'schema_tables' element
 
@@ -2444,16 +2329,16 @@
    0	success
 */
 
-int InfoSchemaMethods::oldFormat(Session *session, InfoSchemaTable *schema_table)
+int plugin::InfoSchemaMethods::oldFormat(Session *session, plugin::InfoSchemaTable *schema_table)
   const
 {
   Name_resolution_context *context= &session->lex->select_lex.context;
-  const InfoSchemaTable::Columns columns= schema_table->getColumns();
-  InfoSchemaTable::Columns::const_iterator iter= columns.begin();
+  const plugin::InfoSchemaTable::Columns columns= schema_table->getColumns();
+  plugin::InfoSchemaTable::Columns::const_iterator iter= columns.begin();
 
   while (iter != columns.end())
   {
-    const ColumnInfo *column= *iter;
+    const plugin::ColumnInfo *column= *iter;
     if (column->getOldName().length() != 0)
     {
       Item_field *field= new Item_field(context,
@@ -2531,7 +2416,7 @@
 bool make_schema_select(Session *session, Select_Lex *sel,
                         const string& schema_table_name)
 {
-  InfoSchemaTable *schema_table= find_schema_table(schema_table_name.c_str());
+  plugin::InfoSchemaTable *schema_table= plugin::InfoSchemaTable::getTable(schema_table_name.c_str());
   LEX_STRING db, table;
   /*
      We have to make non const db_name & table_name
 
=== modified file 'drizzled/show.h'
--- drizzled/show.h	2009-08-04 14:13:13 +0000
+++ drizzled/show.h	2009-09-30 21:30:30 +0000
@@ -40,7 +40,14 @@
 struct st_ha_create_information;
 typedef st_ha_create_information HA_CREATE_INFO;
 struct TableList;
-class InfoSchemaTable;
+namespace drizzled
+{
+namespace plugin
+{
+  class InfoSchemaTable;
+}
+}
+
 
 typedef struct system_status_var STATUS_VAR;
 
@@ -66,7 +73,6 @@
 int wild_case_compare(const CHARSET_INFO * const cs, 
                       const char *str,const char *wildstr);
 
-InfoSchemaTable *find_schema_table(const char* table_name);
 bool make_schema_select(Session *session,  Select_Lex *sel,
                         const std::string& schema_table_name);
 bool mysql_schema_table(Session *session, LEX *lex, TableList *table_list);
@@ -91,7 +97,5 @@
 void init_status_vars();
 void free_status_vars();
 void reset_status_vars();
-void add_infoschema_table(InfoSchemaTable *schema_table);
-void remove_infoschema_table(InfoSchemaTable *table);
 
 #endif /* DRIZZLE_SERVER_SHOW_H */
 
=== removed file 'drizzled/slot/function.h'
--- drizzled/slot/function.h	2009-08-17 21:30:20 +0000
+++ drizzled/slot/function.h	1970-01-01 00:00:00 +0000
@@ -1,66 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef DRIZZLED_SLOT_FUNCTION_H
-#define DRIZZLED_SLOT_FUNCTION_H
-
-/* This file defines structures needed by udf functions */
-
-#include "drizzled/function/func.h"
-#include "drizzled/plugin/function.h"
-#include "drizzled/registry.h"
-
-namespace drizzled
-{
-namespace slot
-{
-
-/**
- * Class to handle all Function plugin objects.
- */
-class Function
-{
-  Registry<const plugin::Function *> udf_registry;
-
-public:
-  Function() : udf_registry() {}
-  ~Function() {}
-
-  /**
-   * Add a new Function factory to the list of factories we manage.
-   */
-  void add(const plugin::Function *function_obj);
-
-  /**
-   * Remove a Function factory from the list of factory we manage.
-   */
-  void remove(const plugin::Function *function_obj);
-
-  /**
-   * Accept a new connection (Protocol object) on one of the configured
-   * listener interfaces.
-   */
-  const plugin::Function *get(const char *name, size_t len=0) const;
-
-};
-
-} /* end namespace slot */
-} /* end namespace drizzled */
-
-#endif /* DRIZZLED_SLOT_FUNCTION_H */
 
=== removed file 'drizzled/slot/listen.h'
--- drizzled/slot/listen.h	2009-08-28 00:07:54 +0000
+++ drizzled/slot/listen.h	1970-01-01 00:00:00 +0000
@@ -1,91 +0,0 @@
-/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
- *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
- *
- *  Copyright (C) 2008 Sun Microsystems
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; version 2 of the License.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#ifndef DRIZZLED_SLOT_LISTEN_H
-#define DRIZZLED_SLOT_LISTEN_H
-
-#include <vector>
-
-struct pollfd;
-
-namespace drizzled
-{
-
-namespace plugin
-{
-class Client;
-class Listen;
-}
-
-namespace slot
-{
-
-/**
- * Class to handle all Listen plugin objects.
- */
-class Listen
-{
-private:
-  std::vector<plugin::Listen *> listen_list;
-  std::vector<plugin::Listen *> listen_fd_list;
-  struct pollfd *fd_list;
-  uint32_t fd_count;
-  int wakeup_pipe[2];
-
-public:
-  Listen();
-  ~Listen();
-
-  /**
-   * Add a new Listen object to the list of listeners we manage.
-   */
-  void add(plugin::Listen &listen_obj);
-
-  /**
-   * Remove a Listen object from the list of listeners we manage.
-   */
-  void remove(plugin::Listen &listen_obj);
-
-  /**
-   * Setup all configured listen plugins.
-   */
-  bool setup(void);
-
-  /**
-   * Accept a new connection (Client object) on one of the configured
-   * listener interfaces.
-   */
-  plugin::Client *getClient(void) const;
-
-  /**
-   * Some internal functions drizzled require a temporary Client object to
-   * create a valid session object, this just returns a dummy client object.
-   */
-  plugin::Client *getNullClient(void) const;
-
-  /**
-   * Shutdown and cleanup listen loop for server shutdown.
-   */
-  void shutdown(void);
-};
-
-} /* end namespace slot */
-} /* end namespace drizzled */
-
-#endif /* DRIZZLED_SLOT_LISTEN_H */
 
=== renamed file 'drizzled/thr_malloc.cc' => 'drizzled/sql_alloc.cc'
=== modified file 'drizzled/sql_base.cc'
--- drizzled/sql_base.cc	2009-08-31 23:50:37 +0000
+++ drizzled/sql_base.cc	2009-09-30 21:30:30 +0000
@@ -44,15 +44,13 @@
 #include <drizzled/replication_services.h>
 #include <drizzled/check_stack_overrun.h>
 #include <drizzled/lock.h>
-#include <drizzled/slot/listen.h>
+#include <drizzled/plugin/listen.h>
 #include <mysys/cached_directory.h>
 
 using namespace std;
 using namespace drizzled;
 
-extern drizzled::ReplicationServices replication_services;
-
-bool drizzle_rm_tmp_tables(slot::Listen &listen_handler);
+bool drizzle_rm_tmp_tables();
 
 /**
   @defgroup Data_Dictionary Data Dictionary
@@ -816,7 +814,7 @@
     close_temporary_table(table, true, true);
   else
   {
-    StorageEngine *table_type= table->s->db_type();
+    plugin::StorageEngine *table_type= table->s->db_type();
     pthread_mutex_lock(&LOCK_open); /* Close and drop a table (AUX routine) */
     /*
       unlink_open_table() also tells threads waiting for refresh or close
@@ -1325,7 +1323,7 @@
                                    table_list->db, table_list->table_name,
                                    false);
 
-      if (StorageEngine::getTableProto(path, NULL) != EEXIST)
+      if (plugin::StorageEngine::getTableProto(path, NULL) != EEXIST)
       {
         /*
           Table to be created, so we need to create placeholder in table-cache.
@@ -2045,6 +2043,7 @@
   */
   if (unlikely(entry->file->implicit_emptied))
   {
+    ReplicationServices &replication_services= ReplicationServices::singleton();
     entry->file->implicit_emptied= 0;
     {
       char *query, *end;
@@ -4533,14 +4532,14 @@
 }
 
 
-bool drizzle_rm_tmp_tables(slot::Listen &listen_handler)
+bool drizzle_rm_tmp_tables()
 {
   char	filePath[FN_REFLEN], filePathCopy[FN_REFLEN];
   Session *session;
 
   assert(drizzle_tmpdir);
 
-  if (!(session= new Session(listen_handler.getNullClient())))
+  if (!(session= new Session(plugin::Listen::getNullClient())))
     return true;
   session->thread_stack= (char*) &session;
   session->storeGlobals();
 
=== modified file 'drizzled/sql_delete.cc'
--- drizzled/sql_delete.cc	2009-09-17 00:08:20 +0000
+++ drizzled/sql_delete.cc	2009-09-30 21:30:30 +0000
@@ -27,6 +27,8 @@
 #include <drizzled/lock.h>
 #include "drizzled/probes.h"
 
+using namespace drizzled;
+
 /**
   Implement DELETE SQL word.
 
@@ -411,7 +413,7 @@
   /* If it is a temporary table, close and regenerate it */
   if (!dont_send_ok && (table= session->find_temporary_table(table_list)))
   {
-    StorageEngine *table_type= table->s->db_type();
+    plugin::StorageEngine *table_type= table->s->db_type();
     TableShare *share= table->s;
 
     if (!table_type->check_flag(HTON_BIT_CAN_RECREATE))
 
=== modified file 'drizzled/sql_lex.h'
--- drizzled/sql_lex.h	2009-09-24 06:11:54 +0000
+++ drizzled/sql_lex.h	2009-09-30 21:30:30 +0000
@@ -25,7 +25,7 @@
 */
 #include <drizzled/message/table.pb.h>
 
-#include "drizzled/slot/function.h"
+#include "drizzled/plugin/function.h"
 #include "drizzled/name_resolution_context.h"
 #include "drizzled/item/subselect.h"
 #include "drizzled/item/param.h"
 
=== modified file 'drizzled/sql_parse.cc'
--- drizzled/sql_parse.cc	2009-09-24 06:23:51 +0000
+++ drizzled/sql_parse.cc	2009-09-30 21:30:30 +0000
@@ -16,7 +16,6 @@