Merge lp:~stewart/drizzle/catalog-in-path-not-chdir into lp:~drizzle-trunk/drizzle/development

[Stewart Smith]

this patch makes the CATALOG be part of the path to all schemas and tables rather than having the server chdir into the local CATALOG.

Currently we just add this in the code that builds the paths. the next step is to have the Itentifier constructors take a Catalog identifier.

[Stewart Smith (stewart)]

I'd just like to add a note that there is backwards compatibility code in this patch, and dbqp does run a (*SIMPLE*) backwards compatibility test... We may choose to add more before merging this branch... I'd like a second opinion on that.

[lp:~stewart/drizzle/catalog-in-path-not-chdir]

2482. By Stewart Smith on 2011-12-28

modify transaction_log plugin to default to local/transaction.log to keep backwards compatibility with old drizzled (before chdir to local/ was removed)

2483. By Stewart Smith on 2011-12-28

modify tableprototester to include local/ in the path for the test tables

2484. By Stewart Smith on 2011-12-28

update innodb-system-table-view.result to include CATALOG in path to table

[Stewart Smith (stewart)]

http://jenkins.drizzle.org/view/Drizzle-param/job/drizzle-param/912/

(should all pass with these extra additions).

(another note is that we're getting closer to the day where some plugins will have to care about CATALOGs)

[Olaf van der Spek (olafvdspek)]

8 - path += "../";
9 + path.clear();
10 path += util::tablename_to_filename(_name);

Why not just path = util::tablename_to_filename(_name);?

review: Needs Fixing

[Stewart Smith (stewart)]

On Wed, 04 Jan 2012 16:14:38 -0000, Olaf van der Spek <email address hidden> wrote:
> 8 - path += "../";
> 9 + path.clear();
> 10 path += util::tablename_to_filename(_name);
>
> Why not just path = util::tablename_to_filename(_name);?

This may be a hangover of previous version of the patch where there was
a method to reset the path (used after initing variables during
startup)

--
Stewart Smith

[lp:~stewart/drizzle/catalog-in-path-not-chdir]

2485. By Stewart Smith on 2012-04-20

merge trunk

2486. By Stewart Smith on 2012-04-20

add the infamous ahhhfuck test, which is a simplified having.test that throws the catalog-in-path-not-chdir tree into a spin with --repeat=2. This test doesn't need repeat, it just fails.

2487. By Stewart Smith on 2012-04-20

have ahhhfuck.test do the repeat internally, so it just fails.

Unmerged revisions

2487. By Stewart Smith on 2012-04-20

have ahhhfuck.test do the repeat internally, so it just fails.

2486. By Stewart Smith on 2012-04-20

add the infamous ahhhfuck test, which is a simplified having.test that throws the catalog-in-path-not-chdir tree into a spin with --repeat=2. This test doesn't need repeat, it just fails.

2485. By Stewart Smith on 2012-04-20

merge trunk

2484. By Stewart Smith on 2011-12-28

update innodb-system-table-view.result to include CATALOG in path to table

2483. By Stewart Smith on 2011-12-28

modify tableprototester to include local/ in the path for the test tables

2482. By Stewart Smith on 2011-12-28

modify transaction_log plugin to default to local/transaction.log to keep backwards compatibility with old drizzled (before chdir to local/ was removed)

2481. By Stewart Smith on 2011-12-27

no longer chdir into local CATALOG. Instead, generate paths everywhere (well... in identifiers) that include the path to the correct CATALOG. Currently that's just LOCAL, but we get closer. Also added is some backwards compatibility code in InnoDB for old data dictionary entries that didn't include CATALOG in catalog/db/table but just had db/table. The next step is to construct the table and schema identifiers with the current CATALOG.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-10 01:04:27 +0000
+++ .bzrignore	2012-04-20 19:19:30 +0000
@@ -13,6 +13,9 @@
 *.rej
 *.reject
 *.rpm
+*.deb
+*.dsc
+*.changes
 *replication.pb.*
 *stamp-h
 ./ChangeLog
@@ -67,6 +70,7 @@
 configvar.gcno
 current_session.gcno
 dbug/Makefile.in
+deb-work-dir
 depcomp
 docs
 docs/doctrees
@@ -311,10 +315,20 @@
 support-files/libdrizzle-1.0.pc
 support-files/libdrizzle-2.0.pc
 support-files/libdrizzleclient.pc
+support-files/deb/debian/changelog
 support-files/smf/Makefile.in
 support-files/smf/drizzle
 support-files/smf/drizzle.xml
 support-files/smf/install.sh
+support-files/rpm/BUILD/*
+support-files/rpm/BUILDROOT/*
+support-files/rpm/SRPMS/*
+support-files/rpm/RPMS/*
+support-files/rpm/RPMS/*/*
+support-files/rpm/SOURCES/*.tar.gz
+support-files/rpm/SPECS/drizzle.spec
+*.tar.gz
+*.rpm
 table.gcno
 table_map_iterator.gcno
 temporal.gcno

=== modified file 'Makefile.am'
--- Makefile.am	2012-02-08 21:33:04 +0000
+++ Makefile.am	2012-04-20 19:19:30 +0000
@@ -162,6 +162,7 @@
 	fi
 
 clean-local:
+	rm  libdrizzle-1.0/version.h
 	find . -name '*.gcno' | xargs rm -f
 	-rm -rf docs/api docs/dev docs/_build docs/doctrees
 	rm -Rf $(SPHINX_BUILDDIR)/html $(SPHINX_BUILDDIR)/dirhtml $(SPHINX_BUILDDIR)/singlehtml \
@@ -169,7 +170,8 @@
 	$(SPHINX_BUILDDIR)/qthelp $(SPHINX_BUILDDIR)/devhelp $(SPHINX_BUILDDIR)/epub \
 	$(SPHINX_BUILDDIR)/latex $(SPHINX_BUILDDIR)/latexpdf $(SPHINX_BUILDDIR)/text \
 	$(SPHINX_BUILDDIR)/man $(SPHINX_BUILDDIR)/changes $(SPHINX_BUILDDIR)/linkcheck \
-	$(SPHINX_BUILDDIR)/doctest
+	$(SPHINX_BUILDDIR)/doctest deb-work-dir support-files/rpm/BUILDROOT/* \
+	support-files/rpm/BUILD/* support-files/rpm/SRPMS/* support-files/rpm/RPMS/*
 
 include config/lcov.am
 
@@ -196,17 +198,3 @@
 	find ./ | $(GREP) \.rej | xargs rm -f
 	find ./ | $(GREP) \~$$ | xargs rm -f
 	bzr unknowns
-
-rpm-build: support-files/drizzle.spec
-	@rm -f ~/rpmbuild/RPMS/x86_64/drizzle-$(VERSION)*.rpm
-	@rm -f ~/rpmbuild/SRPMS/drizzle-$(VERSION)*.rpm
-	@cp drizzle-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
-	@cp support-files/drizzled.init ~/rpmbuild/SOURCES/
-	@rpmbuild -ba support-files/drizzle.spec
-	@cp ~/rpmbuild/RPMS/x86_64/drizzle-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/RPMS/x86_64/drizzle-devel-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/RPMS/x86_64/drizzle-debuginfo-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/RPMS/x86_64/drizzle-server-$(VERSION)*.rpm .
-	@cp ~/rpmbuild/SRPMS/drizzle-$(VERSION)*.rpm .
-
-rpm: man distcheck rpm-build

=== modified file 'configure.ac'
--- configure.ac	2012-02-17 20:27:53 +0000
+++ configure.ac	2012-04-20 19:19:30 +0000
@@ -26,26 +26,7 @@
 
 PANDORA_CANONICAL_TARGET(less-warnings, require-cxx, force-gcc42, version-from-vc) 
 
-LIBDRIZZLE_LIBRARY_VERSION=4:0:0
-#                             | | |
-#                      +------+ | +---+
-#                      |        |     |
-#                   current:revision:age
-#                      |        |     |
-#                      |        |     +- increment if interfaces have been added
-#                      |        |        set to zero if interfaces have been
-#                      |        |        removed or changed
-#                      |        +- increment if source code has changed
-#                      |           set to zero if current is incremented
-#                      +- increment if interfaces have been added, removed or
-#                         changed
-AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
-
-# libdrizzle versioning when linked with GNU ld.
-AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
-  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
-  ])
-AC_SUBST(LD_VERSION_SCRIPT)
+m4_include([m4/libdrizzle_version.m4])
 
 dnl Set the default datadir location to /usr/local/var/drizzle. If a
 dnl localstatedir is explicitly given, just use that.
@@ -154,7 +135,8 @@
 AC_CONFIG_FILES(Makefile dnl
  tests/Makefile dnl
  drizzled/plugin/version.h dnl
- support-files/drizzle.spec dnl
+ support-files/rpm/SPECS/drizzle.spec dnl
+ libdrizzle-1.0/version.h dnl
  support-files/drizzle.pc dnl
  support-files/libdrizzle.pc dnl
  support-files/libdrizzle-1.0.pc dnl

=== modified file 'drizzled/drizzled.cc'
--- drizzled/drizzled.cc	2012-03-20 15:48:48 +0000
+++ drizzled/drizzled.cc	2012-04-20 19:19:30 +0000
@@ -389,6 +389,25 @@
          PANDORA_RELEASE_VERSION, HOST_VENDOR, HOST_OS, HOST_CPU, COMPILATION_COMMENT);
 }
 
+extern "C" {
+
+  char at_exit_pid_file[1024 * 4]= { 0 };
+
+  static void remove_pidfile(void)
+  {
+    if (at_exit_pid_file[0])
+    {
+      if (unlink(at_exit_pid_file) == -1)
+      {
+        std::cerr << "Could not remove pidfile: " << at_exit_pid_file << "(" << strerror(errno) << ")" << std::endl;
+      }
+
+      at_exit_pid_file[0]= 0;
+    }
+  }
+
+}
+
 /**
   Create file to store pid number.
 */
@@ -405,6 +424,8 @@
     {
       if (close(file) != -1)
       {
+        snprintf(at_exit_pid_file, sizeof(at_exit_pid_file), "%s", pid_file.file_string().c_str());
+        atexit(remove_pidfile);
         return;
       }
     }
@@ -535,8 +556,6 @@
   google::protobuf::ShutdownProtobufLibrary();
 #endif
 
-  (void) unlink(pid_file.file_string().c_str());	// This may not always exist
-
   if (print_message && server_start_time)
   {
     errmsg_printf(drizzled::error::INFO, _(ER(ER_SHUTDOWN_COMPLETE)),internal::my_progname);
@@ -1336,7 +1355,7 @@
     unireg_exit();
   }
 
-  if (vm.count("no-defaults"))
+  if (!vm["no-defaults"].as<bool>())
   {
     fs::path system_config_file_drizzle(system_config_dir);
     system_config_file_drizzle /= "drizzled.cnf";
@@ -1757,7 +1776,7 @@
    N_("Don't allow creation of heap tables bigger than this."),
    (char**) &global_system_variables.max_heap_table_size,
    NULL, 0, GET_ULL,
-   REQUIRED_ARG, 16*1024*1024L, 16384, (int64_t)MAX_MEM_TABLE_SIZE,
+   REQUIRED_ARG, 16*1024*1024L, 16384, MAX_MEM_TABLE_SIZE,
    MALLOC_OVERHEAD, 1024, 0},
   {"max_join_size", OPT_MAX_JOIN_SIZE,
    N_("Joins that are probably going to read more than max_join_size records "
@@ -1897,13 +1916,13 @@
    (char**) &my_thread_stack_size,
    NULL, 0, GET_SIZE,
    REQUIRED_ARG,0,
-   UINT32_C(1024*512), (int64_t)SIZE_MAX, 0, 1024, 0},
+   UINT32_C(1024*512), SIZE_MAX, 0, 1024, 0},
   {"tmp_table_size", OPT_TMP_TABLE_SIZE,
    N_("If an internal in-memory temporary table exceeds this size, Drizzle will"
       " automatically convert it to an on-disk MyISAM table."),
    (char**) &global_system_variables.tmp_table_size,
    NULL, 0, GET_ULL,
-   REQUIRED_ARG, 16*1024*1024L, 1024, (int64_t)MAX_MEM_TABLE_SIZE, 0, 1, 0},
+   REQUIRED_ARG, 16*1024*1024L, 1024, MAX_MEM_TABLE_SIZE, 0, 1, 0},
   {0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
 
@@ -2179,13 +2198,18 @@
   }
 
   {
-    fs::path pid_file_path(pid_file);
-    if (pid_file_path.root_path().string() == "")
+    if (pid_file.string().size() and pid_file.string()[0] == '/')
+    { } // Do nothing if the file starts with a slash
+    else
     {
-      pid_file_path= getDataHome();
-      pid_file_path /= pid_file;
+      fs::path pid_file_path(pid_file);
+      if (pid_file_path.root_path().string() == "")
+      {
+        pid_file_path= getDataHome();
+        pid_file_path /= pid_file;
+      }
+      pid_file= fs::system_complete(pid_file_path);
     }
-    pid_file= fs::system_complete(pid_file_path);
   }
 
   const char *tmp_string= getenv("TMPDIR");

=== modified file 'drizzled/execute/parser.yy'
--- drizzled/execute/parser.yy	2012-03-03 21:57:23 +0000
+++ drizzled/execute/parser.yy	2012-04-20 19:19:30 +0000
@@ -69,7 +69,6 @@
 #define YYENABLE_NLS 0
 #define YYLTYPE_IS_TRIVIAL 0
 
-int execute_lex(YYSTYPE* lvalp, void* scanner);
 std::string query;
 #define parser_abort(A, B) do { parser::abort_func((A), (B)); YYABORT; } while (0)
 

=== modified file 'drizzled/identifier/catalog.cc'
--- drizzled/identifier/catalog.cc	2011-10-19 09:25:53 +0000
+++ drizzled/identifier/catalog.cc	2012-04-20 19:19:30 +0000
@@ -50,7 +50,7 @@
 void Catalog::init()
 { 
   assert(not _name.empty());
-  path += "../";
+  path.clear();
   path += util::tablename_to_filename(_name);
   assert(path.length()); // TODO throw exception, this is a possibility
   hash_value= util::insensitive_hash()(path);

=== modified file 'drizzled/identifier/schema.cc'
--- drizzled/identifier/schema.cc	2011-10-19 09:25:53 +0000
+++ drizzled/identifier/schema.cc	2012-04-20 19:19:30 +0000
@@ -56,6 +56,8 @@
 
   if (not db_arg.empty())
   {
+    db_path += drizzled::catalog::local_identifier().getPath();
+    db_path += FN_LIBCHAR;
     db_path += util::tablename_to_filename(db);
     assert(db_path.length()); // TODO throw exception, this is a possibility
   }

=== modified file 'drizzled/identifier/table.cc'
--- drizzled/identifier/table.cc	2012-03-04 15:08:58 +0000
+++ drizzled/identifier/table.cc	2012-04-20 19:19:30 +0000
@@ -33,6 +33,7 @@
 
 #include <drizzled/util/string.h>
 #include <drizzled/util/tablename_to_filename.h>
+#include <drizzled/catalog/local.h>
 
 #include <algorithm>
 #include <sstream>
@@ -179,7 +180,8 @@
 
 std::string Table::build_table_filename(const std::string &in_db, const std::string &in_table_name, bool is_tmp)
 {
-  string in_path= util::tablename_to_filename(in_db) + FN_LIBCHAR;
+  string in_path= drizzled::catalog::local_identifier().getPath();
+  in_path+= FN_LIBCHAR + util::tablename_to_filename(in_db) + FN_LIBCHAR;
   return in_path + (is_tmp ? in_table_name : util::tablename_to_filename(in_table_name));
 }
 

=== modified file 'drizzled/main.cc'
--- drizzled/main.cc	2012-03-15 03:50:03 +0000
+++ drizzled/main.cc	2012-04-20 19:19:30 +0000
@@ -336,11 +336,6 @@
       }
     }
 
-    if (chdir("local") == -1)
-    {
-      unireg_abort << "Local catalog does not exist, was unable to chdir() to " << getDataHome().file_string();
-    }
-
     setFullDataHome(boost::filesystem::system_complete(getDataHome()));
     errmsg_printf(error::INFO, "Data Home directory is : %s", getFullDataHome().native_file_string().c_str());
   }

=== modified file 'drizzled/util/find_ptr.h'
--- drizzled/util/find_ptr.h	2011-05-04 14:26:58 +0000
+++ drizzled/util/find_ptr.h	2012-04-20 19:19:30 +0000
@@ -35,12 +35,12 @@
 typename T::value_type::second_type find_ptr2(T& c, U v)
 {
 	typename T::value_type::second_type* i = find_ptr(c, v);
-	return i ? *i : NULL;
+	return i ? *i : typename T::value_type::second_type();
 }
 
 template <class T, class U>
 const typename T::value_type::second_type find_ptr2(const T& c, U v)
 {
 	const typename T::value_type::second_type* i = find_ptr(c, v);
-	return i ? *i : NULL;
+	return i ? *i : typename T::value_type::second_type();
 }

=== modified file 'libdrizzle-1.0/drizzle_client.h'
--- libdrizzle-1.0/drizzle_client.h	2012-01-05 06:31:25 +0000
+++ libdrizzle-1.0/drizzle_client.h	2012-04-20 19:19:30 +0000
@@ -42,6 +42,7 @@
 
 #pragma once
 
+#include <libdrizzle-1.0/version.h>
 #include <libdrizzle-1.0/drizzle.h>
 #include <libdrizzle-1.0/conn_client.h>
 #include <libdrizzle-1.0/handshake_client.h>

=== modified file 'libdrizzle-1.0/include.am'
--- libdrizzle-1.0/include.am	2012-02-17 20:27:53 +0000
+++ libdrizzle-1.0/include.am	2012-04-20 19:19:30 +0000
@@ -64,6 +64,7 @@
 				      libdrizzle/sha1.cc \
 				      libdrizzle/state.cc
 
+nobase_include_HEADERS+= libdrizzle-1.0/version.h
 nobase_include_HEADERS+= \
 			 libdrizzle-1.0/column.h \
 			 libdrizzle-1.0/column_client.h \

=== added file 'libdrizzle-1.0/version.h.in'
--- libdrizzle-1.0/version.h.in	1970-01-01 00:00:00 +0000
+++ libdrizzle-1.0/version.h.in	2012-04-20 19:19:30 +0000
@@ -0,0 +1,41 @@
+/*
+ * Drizzle Client & Protocol Library
+ *
+ * Copyright (C) 2012 Drizzle Project
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ *     * The names of its contributors may not be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+
+#pragma once
+
+#define LIBDRIZZLE_VERSION_STRING "@LIBDRIZZLE_VERSION@"
+#define LIBDRIZZLE_VERSION_HEX @LIBDRIZZLE_HEX_VERSION@

=== modified file 'libdrizzle/conn.cc'
--- libdrizzle/conn.cc	2012-01-30 05:36:54 +0000
+++ libdrizzle/conn.cc	2012-04-20 19:19:30 +0000
@@ -58,6 +58,86 @@
  */
 static drizzle_return_t _con_setsockopt(drizzle_con_st *con);
 
+static bool connect_poll(drizzle_con_st *con)
+{
+  struct pollfd fds[1];
+  fds[0].fd= con->fd;
+  fds[0].events= POLLOUT;
+
+  size_t loop_max= 5;
+  while (--loop_max) // Should only loop on cases of ERESTART or EINTR
+  {
+    int error= poll(fds, 1, con->drizzle->timeout);
+    switch (error)
+    {
+    case 1:
+      {
+        int err;
+        socklen_t len= sizeof (err);
+        // We replace errno with err if getsockopt() passes, but err has been
+        // set.
+        if (getsockopt(con->fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
+        {
+          // We check the value to see what happened wth the socket.
+          if (err == 0)
+          {
+            return true;
+          }
+          errno= err;
+        }
+
+        // "getsockopt() failed"
+        return false;
+      }
+
+    case 0:
+      {
+        // "timeout occurred while trying to connect"
+        return false;
+      }
+
+    default: // A real error occurred and we need to completely bail
+      switch (get_socket_errno())
+      {
+#ifdef TARGET_OS_LINUX
+      case ERESTART:
+#endif
+      case EINTR:
+        continue;
+
+      case EFAULT:
+      case ENOMEM:
+        // "poll() failure"
+        return false;
+
+      case EINVAL:
+        // "RLIMIT_NOFILE exceeded, or if OSX the timeout value was invalid"
+        return false;
+
+      default: // This should not happen
+        if (fds[0].revents & POLLERR)
+        {
+          int err;
+          socklen_t len= sizeof (err);
+          (void)getsockopt(con->fd, SOL_SOCKET, SO_ERROR, &err, &len);
+          errno= err;
+        }
+        else
+        {
+          errno= get_socket_errno();
+        }
+
+        //"socket error occurred");
+        return false;
+      }
+    }
+  }
+
+  // This should only be possible from ERESTART or EINTR; 
+  // "connection failed (error should be from either ERESTART or EINTR"
+  return false;
+}
+
 /** @} */
 
 /*
@@ -700,13 +780,17 @@
 
     *ret_ptr= drizzle_con_connect(con);
     if (*ret_ptr != DRIZZLE_RETURN_OK)
+    {
       return result;
+    }
   }
 
   if (drizzle_state_none(con))
   {
     if (con->options & (DRIZZLE_CON_RAW_PACKET | DRIZZLE_CON_NO_RESULT_READ))
+    {
       con->result= NULL;
+    }
     else
     {
       for (old_result= con->result_list; old_result != NULL; old_result= old_result->next)
@@ -743,7 +827,9 @@
 
   *ret_ptr= drizzle_state_loop(con);
   if (*ret_ptr == DRIZZLE_RETURN_PAUSE)
+  {
     *ret_ptr= DRIZZLE_RETURN_OK;
+  }
   else if (*ret_ptr != DRIZZLE_RETURN_OK &&
            *ret_ptr != DRIZZLE_RETURN_IO_WAIT &&
            *ret_ptr != DRIZZLE_RETURN_ERROR_CODE)
@@ -1300,6 +1386,11 @@
 
       if (errno == EINPROGRESS)
       {
+        if (connect_poll(con))
+        {
+          drizzle_state_pop(con);
+          return DRIZZLE_RETURN_OK;
+        }
         drizzle_state_pop(con);
         drizzle_state_push(con, drizzle_state_connecting);
         return DRIZZLE_RETURN_OK;

=== modified file 'libdrizzle/drizzle.cc'
--- libdrizzle/drizzle.cc	2012-01-30 05:36:54 +0000
+++ libdrizzle/drizzle.cc	2012-04-20 19:19:30 +0000
@@ -69,7 +69,7 @@
 
 const char *drizzle_version(void)
 {
-  return PACKAGE_VERSION;
+  return LIBDRIZZLE_VERSION_STRING;
 }
 
 const char *drizzle_bugreport(void)

=== added file 'm4/libdrizzle_version.m4'
--- m4/libdrizzle_version.m4	1970-01-01 00:00:00 +0000
+++ m4/libdrizzle_version.m4	2012-04-20 19:19:30 +0000
@@ -0,0 +1,30 @@
+#
+# Version information for libdrizzle
+#
+#
+LIBDRIZZLE_VERSION=1.0.1
+LIBDRIZZLE_LIBRARY_VERSION=4:0:0
+#                             | | |
+#                      +------+ | +---+
+#                      |        |     |
+#                   current:revision:age
+#                      |        |     |
+#                      |        |     +- increment if interfaces have been added
+#                      |        |        set to zero if interfaces have been
+#                      |        |        removed or changed
+#                      |        +- increment if source code has changed
+#                      |           set to zero if current is incremented
+#                      +- increment if interfaces have been added, removed or
+#                         changed
+AC_SUBST(LIBDRIZZLE_LIBRARY_VERSION)
+AC_SUBST(LIBDRIZZLE_VERSION)
+AC_DEFINE_UNQUOTED([LIBDRIZZLE_VERSION],[$LIBDRIZZLE_VERSION], [libdrizzle version])
+
+# libdrizzle versioning when linked with GNU ld.
+AS_IF([test "$lt_cv_prog_gnu_ld" = "yes"],[
+  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_srcdir)/config/drizzle.ver"
+  ])
+AC_SUBST(LD_VERSION_SCRIPT)
+
+LIBDRIZZLE_HEX_VERSION=`echo $LIBDRIZZLE_VERSION | sed 's|[\-a-z0-9]*$||' | awk -F. '{printf "0x%0.2d%0.3d%0.3d", $[]1, $[]2, $[]3}'`
+AC_SUBST([LIBDRIZZLE_HEX_VERSION])

=== modified file 'm4/pandora_vc_build.m4'
--- m4/pandora_vc_build.m4	2012-02-08 21:33:04 +0000
+++ m4/pandora_vc_build.m4	2012-04-20 19:19:30 +0000
@@ -139,6 +139,7 @@
     # We now support release tags to append a descriptive tag -stable, -rc, -beta, -alpha, -milestone.
     # But for the release id we want to remove that.
     PANDORA_VC_TAG_JUST_NUMBERS=`echo ${PANDORA_VC_TAG} | sed -e 's/-stable//' -e 's/-rc//' -e 's/-beta//' -e 's/-alpha//' -e 's/-milestone//'`
+    PANDORA_RELEASE_VERSION_JUST_NUMBERS="${PANDORA_VC_TAG_JUST_NUMBERS}"
     # For release id we make sure each part is at least 2 digits, prepended with 0 when necessary. 
     # Example: 1.2.3 should end up as 10203.
     # The sed's from left to right:
@@ -154,11 +155,13 @@
       # Since this is just a snapshot build, we need to remove that.
       PANDORA_VC_LATEST_TAG_JUST_NUMBERS=`echo ${PANDORA_VC_LATEST_TAG} | sed -e 's/-stable//' -e 's/-rc//' -e 's/-beta//' -e 's/-alpha//' -e 's/-milestone//'`
       PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG_JUST_NUMBERS}.${PANDORA_VC_REVNO}-snapshot"
+      PANDORA_RELEASE_VERSION_JUST_NUMBERS="${PANDORA_VC_LATEST_TAG_JUST_NUMBERS}.${PANDORA_VC_REVNO}"
       changequote(<<, >>)dnl
       PANDORA_RELEASE_ID=`echo ${PANDORA_VC_LATEST_TAG_JUST_NUMBERS} | sed -e 's/\.\([0-9]\)\./.0\1./' | sed -e 's/\.\([0-9]\)$/.0\1/' | sed 's/[^0-9]//g'`
       changequote([, ])dnl
     ],[
       PANDORA_RELEASE_VERSION="${PANDORA_RELEASE_DATE}.${PANDORA_VC_REVNO}"
+      PANDORA_RELEASE_VERSION_JUST_NUMBERS="${PANDORA_RELEASE_VERSION}"
       changequote(<<, >>)dnl
       PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_DATE} | sed 's/[^0-9]//g'`
       changequote([, ])dnl
@@ -169,6 +172,7 @@
   VERSION="${PANDORA_RELEASE_VERSION}"
   AC_DEFINE_UNQUOTED([PANDORA_RELEASE_VERSION],["${PANDORA_RELEASE_VERSION}"],
                      [The real version of the software])
+  AC_SUBST(PANDORA_RELEASE_VERSION_JUST_NUMBERS)
   AC_SUBST(PANDORA_VC_REVNO)
   AC_SUBST(PANDORA_VC_REVID)
   AC_SUBST(PANDORA_VC_BRANCH)

=== modified file 'plugin/innobase/dict/dict0dict.cc'
--- plugin/innobase/dict/dict0dict.cc	2011-02-04 22:30:00 +0000
+++ plugin/innobase/dict/dict0dict.cc	2012-04-20 19:19:30 +0000
@@ -225,6 +225,11 @@
 	const char*	s = strchr(name, '/');
 	ut_a(s);
 
+        s= strchr(s+1, '/');
+
+        if (s == NULL)
+          s= strchr(name, '/');
+
 	return(s + 1);
 }
 
@@ -239,8 +244,14 @@
 				dbname '/' tablename */
 {
 	const char*	s;
-	s = strchr(name, '/');
-	ut_a(s);
+	const char*	catalog;
+	catalog = strchr(name, '/');
+	ut_a(catalog);
+        s= strchr(catalog+1, '/');
+
+        if (s == NULL)
+                s = catalog;
+
 	return(s - name);
 }
 

=== modified file 'plugin/innobase/handler/ha_innodb.cc'
--- plugin/innobase/handler/ha_innodb.cc	2012-03-03 20:57:17 +0000
+++ plugin/innobase/handler/ha_innodb.cc	2012-04-20 19:19:30 +0000
@@ -1799,6 +1799,12 @@
   const char* bufend  = buf + buflen;
 
   if (table_id) {
+    const char* catalog_skip= (const char*) memchr(id, '/', idlen);
+    if (catalog_skip)
+    {
+      idlen = idlen - (catalog_skip - id);
+      id = catalog_skip + 1;
+    }
     const char* slash = (const char*) memchr(id, '/', idlen);
     if (!slash) {
 
@@ -3521,6 +3527,15 @@
   else
   {
     ib_table = dict_table_get(identifier.getKeyPath().c_str(), TRUE);
+    if (ib_table == NULL
+        && drizzled::identifier::Catalog(identifier.getCatalogName())==drizzled::catalog::local_identifier())
+    {
+      std::string table_path_no_catalog(identifier.getKeyPath());
+      table_path_no_catalog.erase(0, drizzled::catalog::local_identifier().getPath().length()+1);
+      /* We try without local/ as old InnoDB data dictionary (pre CATALOG)
+         did not have local/ in data dict, just in filesystem path */
+      ib_table = dict_table_get(table_path_no_catalog.c_str(), TRUE);
+    }
   }
   
   if (NULL == ib_table) {
@@ -6668,6 +6683,16 @@
                                    session.getSqlCommand()
                                    == SQLCOM_DROP_DB);
 
+  if (error == ENOENT
+      && drizzled::identifier::Catalog(identifier.getCatalogName())==drizzled::catalog::local_identifier())
+  {
+    std::string table_path_no_catalog(identifier.getKeyPath());
+    table_path_no_catalog.erase(0, drizzled::catalog::local_identifier().getPath().length()+1);
+  error = row_drop_table_for_mysql(table_path_no_catalog.c_str(), trx,
+                                   session.getSqlCommand()
+                                   == SQLCOM_DROP_DB);
+  }
+
   session.setXaId(trx->id);
 
   /* Flush the log to reduce probability that the .frm files and

=== modified file 'plugin/innobase/tests/r/innodb-system-table-view.result'
--- plugin/innobase/tests/r/innodb-system-table-view.result	2011-04-29 18:45:16 +0000
+++ plugin/innobase/tests/r/innodb-system-table-view.result	2012-04-20 19:19:30 +0000
@@ -58,23 +58,23 @@
 ON DELETE CASCADE) ENGINE=INNODB;
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN;
 ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/constraint_test	test/child	test/parent	1	1
+local/test/constraint_test	local/test/child	local/test/parent	1	1
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN_COLS;
 ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/constraint_test	parent_id	id	0
+local/test/constraint_test	parent_id	id	0
 INSERT INTO parent VALUES(1);
 SELECT name, num_rows, handles_opened
 FROM DATA_DICTIONARY.INNODB_SYS_TABLESTATS
 WHERE name LIKE "%parent";
 name	num_rows	handles_opened
-test/parent	1	1
+local/test/parent	1	1
 SELECT NAME, FLAG, N_COLS, SPACE FROM DATA_DICTIONARY.INNODB_SYS_TABLES;
 NAME	FLAG	N_COLS	SPACE
 SYS_FOREIGN	0	7	0
 SYS_FOREIGN_COLS	0	7	0
 SYS_REPLICATION_LOG	0	11	0
-test/child	1	5	0
-test/parent	1	4	0
+local/test/child	1	5	0
+local/test/parent	1	4	0
 SELECT name, n_fields
 from DATA_DICTIONARY.INNODB_SYS_INDEXES
 WHERE table_id In (SELECT table_id from
@@ -109,11 +109,11 @@
 ON DELETE CASCADE) ENGINE=INNODB;
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN;
 ID	FOR_NAME	REF_NAME	N_COLS	TYPE
-test/constraint_test	test/child	test/parent	2	1
+local/test/constraint_test	local/test/child	local/test/parent	2	1
 SELECT * FROM DATA_DICTIONARY.INNODB_SYS_FOREIGN_COLS;
 ID	FOR_COL_NAME	REF_COL_NAME	POS
-test/constraint_test	id	id	0
-test/constraint_test	parent_id	newid	1
+local/test/constraint_test	id	id	0
+local/test/constraint_test	parent_id	newid	1
 INSERT INTO parent VALUES(1, 9);
 SELECT * FROM parent WHERE id IN (SELECT id FROM parent);
 id	newid
@@ -122,6 +122,6 @@
 FROM DATA_DICTIONARY.INNODB_SYS_TABLESTATS
 WHERE name LIKE "%parent";
 name	num_rows	handles_opened
-test/parent	1	2
+local/test/parent	1	2
 DROP TABLE child;
 DROP TABLE parent;

=== modified file 'plugin/innobase/xtrabackup/xtrabackup.cc'
--- plugin/innobase/xtrabackup/xtrabackup.cc	2012-02-08 21:33:04 +0000
+++ plugin/innobase/xtrabackup/xtrabackup.cc	2012-04-20 19:19:30 +0000
@@ -126,28 +126,6 @@
 
 #include "xtrabackup_api.h"
 
- /* prototypes for static functions in original */
-
- ulint
- recv_find_max_checkpoint(
- /*=====================*/
-                                         /* out: error code or DB_SUCCESS */
-         log_group_t**	max_group,	/* out: max group */
-         ulint*		max_field);	/* out: LOG_CHECKPOINT_1 or
-                                         LOG_CHECKPOINT_2 */
-
-
- void
- os_file_set_nocache(
- /*================*/
-         int		fd,		/* in: file descriptor to alter */
-         const char*	file_name,	/* in: used in the diagnostic message */
-         const char*	operation_name);	/* in: used in the diagnostic message,
-                                         we call os_file_set_nocache()
-                                         immediately after opening or creating
-                                         a file, so this is either "open" or
-                                         "create" */
-
  #include <fcntl.h>
  #include <regex.h>
 
@@ -535,13 +513,6 @@
 thd_set_lock_wait_time(
 /*===================*/
 	drizzled::Session*	,	/*!< in: thread handle (THD*) */
-	ulint	);	/*!< in: time waited for the lock */
-
-UNIV_INTERN
-void
-thd_set_lock_wait_time(
-/*===================*/
-	drizzled::Session*	,	/*!< in: thread handle (THD*) */
 	ulint	)	/*!< in: time waited for the lock */
 {
   return;

=== modified file 'plugin/regex_policy/docs/index.rst'
--- plugin/regex_policy/docs/index.rst	2011-10-23 05:45:09 +0000
+++ plugin/regex_policy/docs/index.rst	2012-04-20 19:19:30 +0000
@@ -64,30 +64,26 @@
 The general line format of a regex policy file is::
 
    USER_PATTERN SCHEMA_OBJECT_PATTERN POLICY
+   In Drizzle 7 and Drizzle 7.1 the POLICY values supported were 'ACCEPT' and 'DENY'. Beginning with Drizzle 7.2.0, the values used should be 'ALLOW' and 'DENY'. Although 'ACCEPT' and 'REJECT' are also supported for backward compatibility, but their use is deprecated.
 
 For example::
 
    # This is a comment line and should be skipped
-   .+ schema=DATA_DICTIONARY ACCEPT
-   .+ schema=INFORMATION_SCHEMA ACCEPT
-   .+ schema=data_dictionary ACCEPT
-   .+ schema=information_schema ACCEPT
-   root table=.+ ACCEPT
-   root schema=.+ ACCEPT
-   root process=.+ ACCEPT
-   user1 schema=user1 ACCEPT
-   user2 schema=user2 ACCEPT
-   user1 process=user1 ACCEPT
-   user2 process=user2 ACCEPT
+   .+ schema=DATA_DICTIONARY ALLOW
+   .+ schema=INFORMATION_SCHEMA ALLOW
+   .+ schema=data_dictionary ALLOW
+   .+ schema=information_schema ALLOW
+   root table=.+ ALLOW
+   root schema=.+ ALLOW
+   root process=.+ ALLOW
+   user1 schema=user1 ALLOW
+   user2 schema=user2 ALLOW
+   user1 process=user1 ALLOW
+   user2 process=user2 ALLOW
    # Default to denying everything
    .+ schema=.+ DENY
    .+ process=.+ DENY
 
-Examples
---------
-
-Sorry, there are no examples for this plugin.
-
 .. _regex_policy_authors:
 
 Authors
@@ -100,7 +96,7 @@
 Version
 -------
 
-This documentation applies to **regex_policy 1.0**.
+This documentation applies to **regex_policy 2.0**.
 
 To see which version of the plugin a Drizzle server is running, execute:
 
@@ -111,6 +107,6 @@
 Changelog
 ---------
 
-v1.0
+v2.0
 ^^^^
 * First release.

=== modified file 'plugin/regex_policy/module.cc'
--- plugin/regex_policy/module.cc	2012-03-15 18:05:43 +0000
+++ plugin/regex_policy/module.cc	2012-04-20 19:19:30 +0000
@@ -361,7 +361,7 @@
 {
   DRIZZLE_VERSION_ID,
   "regex_policy",
-  "1.0",
+  "2.0",
   "Clint Byrum",
   N_("Authorization using a regex-matched policy file"),
   PLUGIN_LICENSE_GPL,

=== modified file 'plugin/regex_policy/policy.h'
--- plugin/regex_policy/policy.h	2012-03-16 16:47:17 +0000
+++ plugin/regex_policy/policy.h	2012-04-20 19:19:30 +0000
@@ -46,9 +46,9 @@
 
 static const char *comment_regex = "^[[:space:]]*#.*$";
 static const char *empty_regex = "^[[:space:]]*$";
-static const char *table_match_regex = "^([^ ]+) table\\=([^ ]+) (ACCEPT|DENY)$";
-static const char *process_match_regex = "^([^ ]+) process\\=([^ ]+) (ACCEPT|DENY)$";
-static const char *schema_match_regex = "^([^ ]+) schema\\=([^ ]+) (ACCEPT|DENY)$";
+static const char *table_match_regex = "^([^ ]+) table\\=([^ ]+) (ACCEPT|REJECT|ALLOW|DENY)$";
+static const char *process_match_regex = "^([^ ]+) process\\=([^ ]+) (ACCEPT|REJECT|ALLOW|DENY)$";
+static const char *schema_match_regex = "^([^ ]+) schema\\=([^ ]+) (ACCEPT|REJECT|ALLOW|DENY)$";
 /* These correspond to the parenthesis above and must stay in sync */
 static const int MATCH_REGEX_USER_POS= 1;
 static const int MATCH_REGEX_OBJECT_POS= 2;
@@ -75,11 +75,11 @@
     user_re(u),
     object_re(obj)
   { 
-    if (act == "ACCEPT")
+    if ((act == "ACCEPT")||(act == "ALLOW"))
     {
       action = POLICY_ACCEPT;
     }
-    else if (act == "DENY")
+    else if ((act == "REJECT")||(act == "DENY"))
     {
       action = POLICY_DENY;
     }
@@ -101,7 +101,7 @@
   }
   const char *getAction() const
   {
-    return action == POLICY_ACCEPT ? "ACCEPT" : "DENY";
+    return action == POLICY_ACCEPT ? "ALLOW" : "DENY";
   }
 };
 

=== added file 'plugin/regex_policy/tests/r/basic_deprecated.result'
--- plugin/regex_policy/tests/r/basic_deprecated.result	1970-01-01 00:00:00 +0000
+++ plugin/regex_policy/tests/r/basic_deprecated.result	2012-04-20 19:19:30 +0000
@@ -0,0 +1,72 @@
+create schema user1;
+create schema user2;
+SELECT SCHEMA_NAME FROM DATA_DICTIONARY.SCHEMAS ORDER BY SCHEMA_NAME;
+SCHEMA_NAME
+DATA_DICTIONARY
+INFORMATION_SCHEMA
+mysql
+test
+user1
+user2
+use user2;
+create table t1 (kill_id int);
+insert into t1 values(connection_id());
+SELECT * from user1.dont_exist;
+ERROR 42S02: Unknown table 'user1.dont_exist'
+SELECT SCHEMA_NAME FROM DATA_DICTIONARY.SCHEMAS ORDER BY SCHEMA_NAME;
+SCHEMA_NAME
+DATA_DICTIONARY
+INFORMATION_SCHEMA
+user1
+SELECT * from user2.dont_exist;
+ERROR 42000: Access denied for user 'user1' to schema 'user2'
+create schema authorize_fail;
+ERROR 42000: Access denied for user 'user1' to schema 'authorize_fail'
+drop schema user2;
+ERROR 42000: Access denied for user 'user1' to schema 'user2'
+create table t1 (kill_id int);
+insert into t1 values(connection_id());
+SELECT USERNAME, DB FROM DATA_DICTIONARY.PROCESSLIST ORDER BY USERNAME, DB;
+USERNAME	DB
+user1	user1
+user1	user1
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+IF(((@id := kill_id) - kill_id), "NO", "YES")
+YES
+kill @id;
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+IF(((@id := kill_id) - kill_id), "NO", "YES")
+YES
+select @id != connection_id();
+@id != connection_id()
+1
+update t1 set kill_id = connection_id();
+SELECT USERNAME, DB FROM DATA_DICTIONARY.PROCESSLIST ORDER BY USERNAME, DB;
+USERNAME	DB
+user2	user2
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+IF(((@id := kill_id) - kill_id), "NO", "YES")
+YES
+kill @id;
+ERROR HY000: Unknown session id: #
+SELECT USERNAME, DB FROM DATA_DICTIONARY.PROCESSLIST ORDER BY USERNAME, DB;
+USERNAME	DB
+root	user2
+user1	user1
+user1	user1
+user2	user2
+use user1;
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+IF(((@id := kill_id) - kill_id), "NO", "YES")
+YES
+kill @id;
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+IF(((@id := kill_id) - kill_id), "NO", "YES")
+YES
+select @id != connection_id();
+@id != connection_id()
+1
+connect(localhost,authz,,authz_no,MASTER_PORT,);
+ERROR 42000: Access denied for user 'authz' to schema 'authz_no'
+drop schema user1;
+drop schema user2;

=== modified file 'plugin/regex_policy/tests/t/basic.policy'
--- plugin/regex_policy/tests/t/basic.policy	2011-03-03 01:55:10 +0000
+++ plugin/regex_policy/tests/t/basic.policy	2012-04-20 19:19:30 +0000
@@ -1,15 +1,15 @@
 # This is a comment line and should be skipped
-.+ schema=DATA_DICTIONARY ACCEPT
-.+ schema=INFORMATION_SCHEMA ACCEPT
-.+ schema=data_dictionary ACCEPT
-.+ schema=information_schema ACCEPT
-root table=.+ ACCEPT
-root schema=.+ ACCEPT
-root process=.+ ACCEPT
-user1 schema=user1 ACCEPT
-user2 schema=user2 ACCEPT
-user1 process=user1 ACCEPT
-user2 process=user2 ACCEPT
+.+ schema=DATA_DICTIONARY ALLOW
+.+ schema=INFORMATION_SCHEMA ALLOW
+.+ schema=data_dictionary ALLOW
+.+ schema=information_schema ALLOW
+root table=.+ ALLOW
+root schema=.+ ALLOW
+root process=.+ ALLOW
+user1 schema=user1 ALLOW
+user2 schema=user2 ALLOW
+user1 process=user1 ALLOW
+user2 process=user2 ALLOW
 # Default to denying everything
 .+ schema=.+ DENY
 .+ process=.+ DENY

=== added file 'plugin/regex_policy/tests/t/basic_deprecated-master.opt'
--- plugin/regex_policy/tests/t/basic_deprecated-master.opt	1970-01-01 00:00:00 +0000
+++ plugin/regex_policy/tests/t/basic_deprecated-master.opt	2012-04-20 19:19:30 +0000
@@ -0,0 +1,1 @@
+--plugin-add=regex_policy --regex-policy.policy=$TOP_SRCDIR/plugin/regex_policy/tests/t/basic_deprecated.policy --verbose=INSPECT

=== added file 'plugin/regex_policy/tests/t/basic_deprecated.policy'
--- plugin/regex_policy/tests/t/basic_deprecated.policy	1970-01-01 00:00:00 +0000
+++ plugin/regex_policy/tests/t/basic_deprecated.policy	2012-04-20 19:19:30 +0000
@@ -0,0 +1,15 @@
+# This is a comment line and should be skipped
+.+ schema=DATA_DICTIONARY ACCEPT
+.+ schema=INFORMATION_SCHEMA ACCEPT
+.+ schema=data_dictionary ACCEPT
+.+ schema=information_schema ACCEPT
+root table=.+ ACCEPT
+root schema=.+ ACCEPT
+root process=.+ ACCEPT
+user1 schema=user1 ACCEPT
+user2 schema=user2 ACCEPT
+user1 process=user1 ACCEPT
+user2 process=user2 ACCEPT
+# Default to denying everything
+.+ schema=.+ REJECT
+.+ process=.+ REJECT

=== added file 'plugin/regex_policy/tests/t/basic_deprecated.test'
--- plugin/regex_policy/tests/t/basic_deprecated.test	1970-01-01 00:00:00 +0000
+++ plugin/regex_policy/tests/t/basic_deprecated.test	2012-04-20 19:19:30 +0000
@@ -0,0 +1,130 @@
+# Check for error if no parameter provided
+create schema user1;
+create schema user2;
+SELECT SCHEMA_NAME FROM DATA_DICTIONARY.SCHEMAS ORDER BY SCHEMA_NAME;
+
+# Set up a table to be able to test not being able to kill other people
+use user2;
+create table t1 (kill_id int);
+insert into t1 values(connection_id());
+
+# Test that we get a normal don't exist error for things that don't exist
+--error ER_TABLE_UNKNOWN
+SELECT * from user1.dont_exist;
+
+# Connect as user1 - should only see information_schema, user1 and
+# data_dictionary
+# Also tests that we are able to read data_dictionary, without which fail
+# would happen
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+connect (should_succeed,localhost,user1,,user1,,);
+connection should_succeed;
+SELECT SCHEMA_NAME FROM DATA_DICTIONARY.SCHEMAS ORDER BY SCHEMA_NAME;
+
+# Test that we get blocked on not being allowed to see user2 at all before
+# we get blocked on the table not existing
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--replace_regex /@'.*?'/@'LOCALHOST'/
+--error ER_DBACCESS_DENIED_ERROR
+SELECT * from user2.dont_exist;
+
+# Test that we can't create a schema that isn't named the same as we are
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--replace_regex /@'.*?'/@'LOCALHOST'/
+--error ER_DBACCESS_DENIED_ERROR
+create schema authorize_fail;
+
+# Test that we can't drop a schema that isn't named the same as we are
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--replace_regex /@'.*?'/@'LOCALHOST'/
+--error ER_DBACCESS_DENIED_ERROR
+drop schema user2;
+
+# Set up a table to test that we can kill other versions of us
+create table t1 (kill_id int);
+insert into t1 values(connection_id());
+
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+connect (con1,localhost,user1,,user1,);
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+connect (con2,localhost,user2,,user2,);
+connection con1;
+
+# Check that we don't see other people's connections
+SELECT USERNAME, DB FROM DATA_DICTIONARY.PROCESSLIST ORDER BY USERNAME, DB;
+
+# Check that we can kill a process that is owned by our user
+--disable_reconnect
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+kill @id;
+
+connection should_succeed;
+--sleep 2
+
+--disable_query_log
+--disable_result_log
+# One of the following statements should fail
+--error EE_OK,EE_BADCLOSE,EE_UNKNOWN_CHARSET,EE_CANT_SYMLINK
+select 1;
+--error EE_OK,EE_BADCLOSE,EE_UNKNOWN_CHARSET,EE_CANT_SYMLINK
+select 1;
+--enable_query_log
+--enable_result_log
+--enable_reconnect
+
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+select @id != connection_id();
+
+# Set the table to our current id now
+update t1 set kill_id = connection_id();
+
+# Test that we cannot kill a process owned by someone else
+connection con2;
+SELECT USERNAME, DB FROM DATA_DICTIONARY.PROCESSLIST ORDER BY USERNAME, DB;
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+
+--replace_regex /Unknown session id: [0-9]+/Unknown session id: #/
+--error ER_NO_SUCH_THREAD
+kill @id;
+
+# Test that root can see everybody
+connection default;
+SELECT USERNAME, DB FROM DATA_DICTIONARY.PROCESSLIST ORDER BY USERNAME, DB;
+
+# Test that root can kill someone else
+use user1;
+--disable_reconnect
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+kill @id;
+
+connection should_succeed;
+--sleep 2
+
+--disable_query_log
+--disable_result_log
+# One of the following statements should fail
+--error EE_OK,EE_BADCLOSE,EE_UNKNOWN_CHARSET,EE_CANT_SYMLINK
+select 1;
+--error EE_OK,EE_BADCLOSE,EE_UNKNOWN_CHARSET,EE_CANT_SYMLINK
+select 1;
+--enable_query_log
+--enable_result_log
+--enable_reconnect
+
+select IF(((@id := kill_id) - kill_id), "NO", "YES") from t1;
+select @id != connection_id();
+
+
+# Test failing initial connection
+--replace_result $MASTER_MYSOCK MASTER_SOCKET $MASTER_MYPORT MASTER_PORT
+--replace_regex /@'.*?'/@'LOCALHOST'/
+--error ER_DBACCESS_DENIED_ERROR
+connect (should_fail,localhost,authz,,authz_no,,);
+
+# Clean up after ourselves
+connection default;
+drop schema user1;
+drop schema user2;
+disconnect con1;
+disconnect con2;
+disconnect should_succeed;

=== modified file 'plugin/tableprototester/tableprototester.cc'
--- plugin/tableprototester/tableprototester.cc	2012-01-15 20:54:59 +0000
+++ plugin/tableprototester/tableprototester.cc	2012-04-20 19:19:30 +0000
@@ -118,11 +118,11 @@
 
 bool TableProtoTesterEngine::doDoesTableExist(Session&, const drizzled::identifier::Table &identifier)
 {
-  if (not identifier.getPath().compare("test/t1"))
-    return true;
-  if (not identifier.getPath().compare("test/too_many_enum_values"))
-    return true;
-  if (not identifier.getPath().compare("test/invalid_table_collation"))
+  if (not identifier.getPath().compare("local/test/t1"))
+    return true;
+  if (not identifier.getPath().compare("local/test/too_many_enum_values"))
+    return true;
+  if (not identifier.getPath().compare("local/test/invalid_table_collation"))
     return true;
 
   return false;
@@ -239,17 +239,17 @@
                                                  const drizzled::identifier::Table &identifier,
                                                  drizzled::message::Table &table_proto)
 {
-  if (not identifier.getPath().compare("test/t1"))
+  if (not identifier.getPath().compare("local/test/t1"))
   {
     fill_table1(table_proto);
     return EEXIST;
   }
-  else if (not identifier.getPath().compare("test/too_many_enum_values"))
+  else if (not identifier.getPath().compare("local/test/too_many_enum_values"))
   {
     fill_table_too_many_enum_values(table_proto);
     return EEXIST;
   }
-  else if (not identifier.getPath().compare("test/invalid_table_collation"))
+  else if (not identifier.getPath().compare("local/test/invalid_table_collation"))
   {
     fill_table_invalid_table_collation(table_proto);
     return EEXIST;

=== modified file 'plugin/user_locks/barriers.cc'
--- plugin/user_locks/barriers.cc	2011-02-24 13:19:47 +0000
+++ plugin/user_locks/barriers.cc	2012-04-20 19:19:30 +0000
@@ -51,16 +51,16 @@
 return_t Barriers::release(const user_locks::Key &arg, drizzled::session_id_t owner)
 {
   boost::unique_lock<boost::mutex> scope(mutex);
-  Map::iterator iter= barrier_map.find(arg);
+  Barrier::shared_ptr iter= find_ptr2(barrier_map, arg);
 
   // Nothing is found
-  if ( iter == barrier_map.end())
+  if (not iter)
     return NOT_FOUND;
 
-  if (not iter->second->getOwner() == owner)
+  if (iter->getOwner() != owner)
     return NOT_OWNED_BY;
 
-  iter->second->signal(); // We tell anyone left to start running
+  iter->signal(); // We tell anyone left to start running
   (void)barrier_map.erase(arg);
 
   return SUCCESS;
@@ -69,12 +69,7 @@
 Barrier::shared_ptr Barriers::find(const user_locks::Key &arg)
 {
   boost::unique_lock<boost::mutex> scope(mutex);
-  Map::iterator iter= barrier_map.find(arg);
-
-  if (iter != barrier_map.end())
-    return iter->second;
-
-  return Barrier::shared_ptr();
+  return find_ptr2(barrier_map, arg);
 }
 
 void Barriers::Copy(Map &arg)

=== modified file 'po/ar.po'
--- po/ar.po	2012-02-15 14:37:56 +0000
+++ po/ar.po	2012-04-20 19:19:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: drizzle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 20:06+0530\n"
+"POT-Creation-Date: 2012-03-23 19:48+0530\n"
 "PO-Revision-Date: 2010-12-11 01:19+0000\n"
 "Last-Translator: TaleAlkam <Unknown>\n"
 "Language-Team: Arabic <[e-mail]>\n"
@@ -335,7 +335,7 @@
 msgid "Ping the server to check if it's alive."
 msgstr ""
 
-#: ../client/drizzle.cc:1421 ../drizzled/drizzled.cc:1064
+#: ../client/drizzle.cc:1421 ../drizzled/drizzled.cc:1115
 msgid "Configuration file defaults are not used if no-defaults is set"
 msgstr ""
 
@@ -486,7 +486,6 @@
 msgstr ""
 
 #: ../client/drizzle.cc:1487 ../client/drizzledump.cc:548
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:648
 msgid "User for login if not current user."
 msgstr ""
 
@@ -1026,8 +1025,7 @@
 #: ../client/drizzledump.cc:506
 msgid ""
 "Give less verbose output (useful for debugging). Disables structure comments "
-"and header/footer constructs.  Enables options --skip-add-drop-table --no-"
-"set-names --skip-disable-keys"
+"and header/footer constructs.  Enables option --skip-disable-keys"
 msgstr ""
 
 #: ../client/drizzledump.cc:508
@@ -1121,12 +1119,10 @@
 msgstr ""
 
 #: ../client/drizzledump.cc:546
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:650
 msgid "Port number to use for connection."
 msgstr ""
 
 #: ../client/drizzledump.cc:550
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:654
 msgid "The protocol of connection (mysql or drizzle)."
 msgstr ""
 
@@ -1264,413 +1260,413 @@
 msgid "Could not open '%s' for reading: errno = %d"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:356
+#: ../drizzled/drizzled.cc:359
 msgid "General Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:357
+#: ../drizzled/drizzled.cc:360
 msgid "Config File Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:358
+#: ../drizzled/drizzled.cc:361
 msgid "Kernel Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:359
+#: ../drizzled/drizzled.cc:362
 msgid "Plugin Loading Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:360
+#: ../drizzled/drizzled.cc:363
 msgid "Plugin Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:361
+#: ../drizzled/drizzled.cc:364
 msgid "Config and Plugin Loading"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:362
+#: ../drizzled/drizzled.cc:365
 msgid "Kernel and Plugin Loading and Plugin"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:476
+#: ../drizzled/drizzled.cc:509
 #, fuzzy
 msgid "Aborting:"
 msgstr "إحباط"
 
-#: ../drizzled/drizzled.cc:534
+#: ../drizzled/drizzled.cc:571
 msgid "One can only use the --user switch if running as root"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:541
+#: ../drizzled/drizzled.cc:578
 msgid ""
 "drizzled cannot be run as root, use --user to start drizzled up as another "
 "user"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:584
+#: ../drizzled/drizzled.cc:628
 msgid "Set process group ID failed "
 msgstr ""
 
-#: ../drizzled/drizzled.cc:588
+#: ../drizzled/drizzled.cc:632
 msgid "Set process user ID failed"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:599
+#: ../drizzled/drizzled.cc:643
 msgid "Process chroot failed"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:698
+#: ../drizzled/drizzled.cc:742
 msgid "Invalid Value for auto_increment_increment"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:708
+#: ../drizzled/drizzled.cc:752
 msgid "Invalid Value for auto_increment_offset"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:718
+#: ../drizzled/drizzled.cc:762
 msgid "Invalid Value for completion_type"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:729
+#: ../drizzled/drizzled.cc:773
 msgid "Invalid Value for div-precision-increment"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:739
+#: ../drizzled/drizzled.cc:783
 msgid "Invalid Value for group_concat_max_len"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:749
+#: ../drizzled/drizzled.cc:793
 msgid "Invalid Value for join_buffer_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:760
+#: ../drizzled/drizzled.cc:804
 msgid "Invalid Value for max_allowed_packet"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:771
+#: ../drizzled/drizzled.cc:815
 msgid "Invalid Value for max_error_count"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:781
+#: ../drizzled/drizzled.cc:825
 msgid "Invalid Value for max_heap_table_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:792
+#: ../drizzled/drizzled.cc:836
 msgid "Invalid Value for min_examined_row_limit"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:802
+#: ../drizzled/drizzled.cc:846
 msgid "Invalid Value for max_join_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:812
+#: ../drizzled/drizzled.cc:856
 msgid "Invalid Value for max_length_for_sort_data"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:822
+#: ../drizzled/drizzled.cc:866
 msgid "Invalid Value for max_seeks_for_key"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:832
+#: ../drizzled/drizzled.cc:876
 msgid "Invalid Value for max_sort_length"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:842
+#: ../drizzled/drizzled.cc:886
 msgid "Invalid Value for optimizer_search_depth"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:852
+#: ../drizzled/drizzled.cc:896
 msgid "Invalid Value for preload_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:862
+#: ../drizzled/drizzled.cc:906
 msgid "Invalid Value for query_alloc_block_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:873
+#: ../drizzled/drizzled.cc:917
 msgid "Invalid Value for query_prealloc_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:884
+#: ../drizzled/drizzled.cc:928
 msgid "Invalid Value for range_alloc_block_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:895
+#: ../drizzled/drizzled.cc:939
 msgid "Invalid Value for read_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:906
+#: ../drizzled/drizzled.cc:950
 msgid "Invalid Value for read_rnd_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:916
+#: ../drizzled/drizzled.cc:960
 msgid "Invalid Value for sort_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:926
+#: ../drizzled/drizzled.cc:970
 msgid "Invalid Value for table_def_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:936
+#: ../drizzled/drizzled.cc:980
 msgid "Invalid Value for table_cache_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:946 ../drizzled/drizzled.cc:961
+#: ../drizzled/drizzled.cc:990 ../drizzled/drizzled.cc:1005
 msgid "Invalid Value for table_lock_wait_timeout"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:971
+#: ../drizzled/drizzled.cc:1015
 msgid ""
 "Invalid Value for transaction_message_threshold valid values are between "
 "131072 - 1048576 bytes"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1039
+#: ../drizzled/drizzled.cc:1090
 #, c-format
 msgid "gethostname failed, using '%s' as hostname"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1053
+#: ../drizzled/drizzled.cc:1104
 #, fuzzy
 msgid "Display help and exit."
 msgstr "إظهار هذه المساعدة."
 
-#: ../drizzled/drizzled.cc:1055
+#: ../drizzled/drizzled.cc:1106
 msgid "Run as a daemon."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1057 ../drizzled/drizzled.cc:1670
+#: ../drizzled/drizzled.cc:1108 ../drizzled/drizzled.cc:1724
 msgid "Run drizzled daemon as user."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1059
+#: ../drizzled/drizzled.cc:1110
 msgid "Print version information and exit."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1066
+#: ../drizzled/drizzled.cc:1117
 msgid "Configuration file to use"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1068
+#: ../drizzled/drizzled.cc:1119
 msgid "Base location for config files"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1070 ../drizzled/drizzled.cc:1762
+#: ../drizzled/drizzled.cc:1121 ../drizzled/drizzled.cc:1816
 msgid "Directory for plugins."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1075 ../drizzled/drizzled.cc:1766
+#: ../drizzled/drizzled.cc:1126 ../drizzled/drizzled.cc:1820
 msgid ""
 "Optional comma separated list of plugins to load at startup in addition to "
 "the default list of plugins. [for example: --plugin_add=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1079 ../drizzled/drizzled.cc:1772
+#: ../drizzled/drizzled.cc:1130 ../drizzled/drizzled.cc:1826
 msgid ""
 "Optional comma separated list of plugins to not load at startup. Effectively "
 "removes a plugin from the list of plugins to be loaded. [for example: --"
 "plugin_remove=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1083 ../drizzled/drizzled.cc:1778
+#: ../drizzled/drizzled.cc:1134 ../drizzled/drizzled.cc:1832
 msgid ""
 "Optional comma separated list of plugins to load at starup instead of the "
 "default plugin load list. [for example: --plugin_load=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1090 ../drizzled/drizzled.cc:1582
+#: ../drizzled/drizzled.cc:1141 ../drizzled/drizzled.cc:1636
 msgid "Auto-increment columns are incremented by this"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1092 ../drizzled/drizzled.cc:1587
+#: ../drizzled/drizzled.cc:1143 ../drizzled/drizzled.cc:1641
 msgid ""
 "Offset added to Auto-increment columns. Used when auto-increment-increment !"
 "= 1"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1094 ../drizzled/drizzled.cc:1593
+#: ../drizzled/drizzled.cc:1145 ../drizzled/drizzled.cc:1647
 msgid ""
 "Path to installation directory. All paths are usually resolved relative to "
 "this."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1097 ../drizzled/drizzled.cc:1598
+#: ../drizzled/drizzled.cc:1148 ../drizzled/drizzled.cc:1652
 msgid "Chroot drizzled daemon during startup."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1099
+#: ../drizzled/drizzled.cc:1150
 msgid "Set the default collation."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1101 ../drizzled/drizzled.cc:1602
+#: ../drizzled/drizzled.cc:1152 ../drizzled/drizzled.cc:1656
 msgid "Default completion type."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1102 ../drizzled/drizzled.cc:1607
+#: ../drizzled/drizzled.cc:1153 ../drizzled/drizzled.cc:1661
 msgid "Write core on errors."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1104 ../drizzled/drizzled.cc:1611
+#: ../drizzled/drizzled.cc:1155 ../drizzled/drizzled.cc:1665
 #: ../plugin/innobase/xtrabackup/xtrabackup.cc:4772
 msgid "Path to the database root."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1106
+#: ../drizzled/drizzled.cc:1157
 msgid "Set the default storage engine for tables."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1108
+#: ../drizzled/drizzled.cc:1159
 msgid "Set the default time zone."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1110 ../drizzled/drizzled.cc:1615
+#: ../drizzled/drizzled.cc:1161 ../drizzled/drizzled.cc:1669
 msgid "Used for debugging;  Use at your own risk!"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1112 ../drizzled/drizzled.cc:1620
+#: ../drizzled/drizzled.cc:1163 ../drizzled/drizzled.cc:1674
 msgid "Set up signals usable for debugging"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1114
+#: ../drizzled/drizzled.cc:1165
 msgid "Set the language used for the month names and the days of the week."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1116 ../drizzled/drizzled.cc:1624
+#: ../drizzled/drizzled.cc:1167 ../drizzled/drizzled.cc:1678
 msgid "Log some not critical warnings to the log file."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1118 ../drizzled/drizzled.cc:1629
+#: ../drizzled/drizzled.cc:1169 ../drizzled/drizzled.cc:1683
 msgid "Pid file used by drizzled."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1120
+#: ../drizzled/drizzled.cc:1171
 msgid "Maximum time in seconds to wait for the port to become free. "
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1122
+#: ../drizzled/drizzled.cc:1173
 msgid "Include the SQL query in replicated protobuf messages."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1124 ../drizzled/drizzled.cc:1638
+#: ../drizzled/drizzled.cc:1175 ../drizzled/drizzled.cc:1692
 msgid ""
 "Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within "
 "specified directory"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1127 ../drizzled/drizzled.cc:1643
+#: ../drizzled/drizzled.cc:1178 ../drizzled/drizzled.cc:1697
 msgid ""
 "Uniquely identifies the server instance in the community of replication "
 "partners."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1130 ../drizzled/drizzled.cc:1648
+#: ../drizzled/drizzled.cc:1181 ../drizzled/drizzled.cc:1702
 msgid "Don't print a stack trace on failure."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1132 ../drizzled/drizzled.cc:1652
+#: ../drizzled/drizzled.cc:1183 ../drizzled/drizzled.cc:1706
 msgid "Enable symbolic link support."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1134 ../drizzled/drizzled.cc:1661
+#: ../drizzled/drizzled.cc:1185 ../drizzled/drizzled.cc:1715
 msgid ""
 "Specify whether to time mutexes (only InnoDB mutexes are currently supported)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1137
+#: ../drizzled/drizzled.cc:1188
 msgid "Path for temporary files."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1139 ../drizzled/drizzled.cc:1666
+#: ../drizzled/drizzled.cc:1190 ../drizzled/drizzled.cc:1720
 msgid "Default transaction isolation level."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1141
+#: ../drizzled/drizzled.cc:1192
 msgid ""
 "Max message size written to transaction log, valid values 131072 - 1048576 "
 "bytes."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1143 ../drizzled/drizzled.cc:1674
+#: ../drizzled/drizzled.cc:1194 ../drizzled/drizzled.cc:1728
 msgid ""
 "The number of outstanding connection requests Drizzle can have. This comes "
 "into play when the main Drizzle thread gets very many connection requests in "
 "a very short time."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1148 ../drizzled/drizzled.cc:1680
+#: ../drizzled/drizzled.cc:1199 ../drizzled/drizzled.cc:1734
 msgid ""
 "Size of tree cache used in bulk insert optimization. Note that this is a "
 "limit per thread!"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1151 ../drizzled/drizzled.cc:1686
+#: ../drizzled/drizzled.cc:1202 ../drizzled/drizzled.cc:1740
 msgid ""
 "Precision of the result of '/' operator will be increased on that value."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1154
+#: ../drizzled/drizzled.cc:1205
 msgid "The maximum length of the result of function  group_concat."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1156 ../drizzled/drizzled.cc:1692
+#: ../drizzled/drizzled.cc:1207 ../drizzled/drizzled.cc:1746
 msgid "The size of the buffer that is used for full joins."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1159
+#: ../drizzled/drizzled.cc:1210
 msgid ""
 "A global cap on the amount of memory that can be allocated by session join "
 "buffers (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1161 ../drizzled/drizzled.cc:1698
+#: ../drizzled/drizzled.cc:1212 ../drizzled/drizzled.cc:1752
 msgid "Max packetlength to send/receive from to server."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1163
+#: ../drizzled/drizzled.cc:1214
 msgid "Max number of errors/warnings to store for a statement."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1165 ../drizzled/drizzled.cc:1703
+#: ../drizzled/drizzled.cc:1216 ../drizzled/drizzled.cc:1757
 msgid "Don't allow creation of heap tables bigger than this."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1167 ../drizzled/drizzled.cc:1709
+#: ../drizzled/drizzled.cc:1218 ../drizzled/drizzled.cc:1763
 msgid ""
 "Joins that are probably going to read more than max_join_size records return "
 "an error."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1170 ../drizzled/drizzled.cc:1715
+#: ../drizzled/drizzled.cc:1221 ../drizzled/drizzled.cc:1769
 msgid "Max number of bytes in sorted records."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1172 ../drizzled/drizzled.cc:1720
+#: ../drizzled/drizzled.cc:1223 ../drizzled/drizzled.cc:1774
 msgid "Limit assumed max number of seeks when looking up rows based on a key"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1174 ../drizzled/drizzled.cc:1725
+#: ../drizzled/drizzled.cc:1225 ../drizzled/drizzled.cc:1779
 msgid ""
 "The number of bytes to use when sorting BLOB or TEXT values (only the first "
 "max_sort_length bytes of each value are used; the rest are ignored)."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1178 ../drizzled/drizzled.cc:1732
+#: ../drizzled/drizzled.cc:1229 ../drizzled/drizzled.cc:1786
 msgid "After this many write locks, allow some read locks to run in between."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1180 ../drizzled/drizzled.cc:1736
+#: ../drizzled/drizzled.cc:1231 ../drizzled/drizzled.cc:1790
 msgid ""
 "Don't log queries which examine less than min_examined_row_limit rows to "
 "file."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1183
+#: ../drizzled/drizzled.cc:1234
 msgid ""
 "Do not apply any heuristic(s) during query optimization to prune, thus "
 "perform an exhaustive search from the optimizer search space."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1186 ../drizzled/drizzled.cc:1750
+#: ../drizzled/drizzled.cc:1237 ../drizzled/drizzled.cc:1804
 msgid ""
 "Maximum depth of search performed by the query optimizer. Values larger than "
 "the number of relations in a query result in better query plans, but take "
@@ -1681,124 +1677,124 @@
 "(used for testing/comparison)."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1195 ../drizzled/drizzled.cc:1784
+#: ../drizzled/drizzled.cc:1246 ../drizzled/drizzled.cc:1838
 msgid "The size of the buffer that is allocated when preloading indexes"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1198 ../drizzled/drizzled.cc:1789
+#: ../drizzled/drizzled.cc:1249 ../drizzled/drizzled.cc:1843
 msgid "Allocation block size for query parsing and execution"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1201 ../drizzled/drizzled.cc:1794
+#: ../drizzled/drizzled.cc:1252 ../drizzled/drizzled.cc:1848
 msgid "Persistent buffer for query parsing and execution"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1204 ../drizzled/drizzled.cc:1800
+#: ../drizzled/drizzled.cc:1255 ../drizzled/drizzled.cc:1854
 msgid "Allocation block size for storing ranges during optimization"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1207 ../drizzled/drizzled.cc:1806
+#: ../drizzled/drizzled.cc:1258 ../drizzled/drizzled.cc:1860
 msgid ""
 "Each thread that does a sequential scan allocates a buffer of this size for "
 "each table it scans. If you do many sequential scans, you may want to "
 "increase this value."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1212
+#: ../drizzled/drizzled.cc:1263
 msgid "A global cap on the size of read-buffer-size (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1215 ../drizzled/drizzled.cc:1814
+#: ../drizzled/drizzled.cc:1266 ../drizzled/drizzled.cc:1868
 msgid ""
 "When reading rows in sorted order after a sort, the rows are read through "
 "this buffer to avoid a disk seeks. If not set, then it's set to the value of "
 "record_buffer."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1220
+#: ../drizzled/drizzled.cc:1271
 msgid "A global cap on the size of read-rnd-buffer-size (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1222
+#: ../drizzled/drizzled.cc:1273
 msgid "Select scheduler to be used (by default multi-thread)."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1225 ../drizzled/drizzled.cc:1823
+#: ../drizzled/drizzled.cc:1276 ../drizzled/drizzled.cc:1877
 msgid "Each thread that needs to do a sort allocates a buffer of this size."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1228
+#: ../drizzled/drizzled.cc:1279
 msgid ""
 "A global cap on the amount of memory that can be allocated by session sort "
 "buffers (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1230 ../drizzled/drizzled.cc:1829
+#: ../drizzled/drizzled.cc:1281 ../drizzled/drizzled.cc:1883
 msgid "The number of cached table definitions."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1232 ../drizzled/drizzled.cc:1833
+#: ../drizzled/drizzled.cc:1283 ../drizzled/drizzled.cc:1887
 msgid "The number of cached open tables."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1234 ../drizzled/drizzled.cc:1837
+#: ../drizzled/drizzled.cc:1285 ../drizzled/drizzled.cc:1891
 msgid ""
 "Timeout in seconds to wait for a table level lock before returning an error. "
 "Used only if the connection has active cursors."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1237 ../drizzled/drizzled.cc:1842
+#: ../drizzled/drizzled.cc:1288 ../drizzled/drizzled.cc:1896
 msgid "The stack size for each thread."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1240 ../drizzled/drizzled.cc:1848
+#: ../drizzled/drizzled.cc:1291 ../drizzled/drizzled.cc:1902
 msgid ""
 "If an internal in-memory temporary table exceeds this size, Drizzle will "
 "automatically convert it to an on-disk MyISAM table."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1243
+#: ../drizzled/drizzled.cc:1294
 msgid ""
 "The verbosity of messages from drizzled.  Possible values are INSPECT, INFO, "
 "WARN or ERROR"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1267
+#: ../drizzled/drizzled.cc:1318
 msgid "Duplicate entry for command line option"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1340
+#: ../drizzled/drizzled.cc:1391
 msgid "Failed to initialize plugins"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1409
+#: ../drizzled/drizzled.cc:1463
 msgid "Error getting default charset"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1423
+#: ../drizzled/drizzled.cc:1477
 msgid "Error setting collation"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1430
+#: ../drizzled/drizzled.cc:1484
 #, c-format
 msgid "Unknown locale: '%s'"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1477
+#: ../drizzled/drizzled.cc:1531
 msgid "No scheduler found"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1495
+#: ../drizzled/drizzled.cc:1549
 msgid "Unknown/unsupported storage engine: "
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1633
+#: ../drizzled/drizzled.cc:1687
 msgid ""
 "Maximum time in seconds to wait for the port to become free. (Default: no "
 "wait)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1742
+#: ../drizzled/drizzled.cc:1796
 msgid ""
 "Controls the heuristic(s) applied during query optimization to prune less-"
 "promising partial plans from the optimizer search space. Meaning: false - do "
@@ -1806,7 +1802,7 @@
 "based on number of retrieved rows."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1869
+#: ../drizzled/drizzled.cc:1923
 msgid ""
 "Copyright (C) 2010-2011 Drizzle Developers, Copyright (C) 2008 Sun "
 "Microsystems\n"
@@ -1815,31 +1811,31 @@
 "\n"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1876
+#: ../drizzled/drizzled.cc:1930
 #, c-format
 msgid "Usage: %s [OPTIONS]\n"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1988
+#: ../drizzled/drizzled.cc:2042
 #, c-format
 msgid ""
 "Ignoring user change to '%s' because the user was set to '%s' earlier on the "
 "command line"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1998
+#: ../drizzled/drizzled.cc:2052
 msgid "sort-heap-threshold cannot be less than sort-buffer-size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:2009
+#: ../drizzled/drizzled.cc:2063
 msgid "join-heap-threshold cannot be less than join-buffer-size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:2020
+#: ../drizzled/drizzled.cc:2074
 msgid "read-rnd-threshold cannot be less than read-rnd-buffer-size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:2031
+#: ../drizzled/drizzled.cc:2085
 msgid "read-buffer-threshold cannot be less than read-buffer-size"
 msgstr ""
 
@@ -3830,7 +3826,7 @@
 "\n"
 msgstr ""
 
-#: ../drizzled/sql_table.cc:1862
+#: ../drizzled/sql_table.cc:1864
 #, c-format
 msgid "Unknown - internal error %d during operation"
 msgstr ""
@@ -3861,22 +3857,30 @@
 msgid "Got error %d when reading table '%s'"
 msgstr ""
 
-#: ../drizzled/table/instance/base.cc:1735
+#: ../drizzled/table/instance/base.cc:1734
 #, c-format
 msgid "Unknown collation '%s' in table '%-.64s' definition"
 msgstr ""
 
-#: ../drizzled/table/instance/base.cc:1740
+#: ../drizzled/table/instance/base.cc:1739
 #, c-format
 msgid ""
 "Table '%-.64s' was created with a different version of Drizzle and cannot be "
 "read"
 msgstr ""
 
+#: ../plugin/ascii/ascii.cc:86
+msgid "ASCII function"
+msgstr ""
+
 #: ../plugin/auth_all/auth_all.cc:84
 msgid "Allow anonymous access"
 msgstr ""
 
+#: ../plugin/auth_all/auth_all.cc:96
+msgid "Allows all users to authenticate regardless of username or password"
+msgstr ""
+
 #: ../plugin/auth_file/auth_file.cc:205
 #, c-format
 msgid "Could not load auth file: %s\n"
@@ -3886,6 +3890,10 @@
 msgid "File to load for usernames and passwords"
 msgstr ""
 
+#: ../plugin/auth_file/auth_file.cc:232
+msgid "Authentication against a plain text file"
+msgstr ""
+
 #: ../plugin/auth_http/auth_http.cc:135
 msgid ""
 "auth_http plugin loaded but required option url not specified. Against which "
@@ -3896,6 +3904,10 @@
 msgid "URL for HTTP Auth check"
 msgstr ""
 
+#: ../plugin/auth_http/auth_http.cc:161
+msgid "Authenication against a web server using HTTP"
+msgstr ""
+
 #: ../plugin/auth_ldap/auth_ldap.cc:291
 #, c-format
 msgid "Reconnect failed: %s\n"
@@ -3939,6 +3951,14 @@
 msgid "How often to empty the users cache, 0 to disable"
 msgstr ""
 
+#: ../plugin/auth_ldap/auth_ldap.cc:460
+msgid "Authentication against an LDAP server"
+msgstr ""
+
+#: ../plugin/auth_pam/auth_pam.cc:146
+msgid "Authenication against system user accounts using PAM"
+msgstr ""
+
 #: ../plugin/auth_schema/auth_schema.cc:52
 msgid "auth_schema table cannot be an empty string"
 msgstr ""
@@ -3960,6 +3980,42 @@
 msgid "Database-qualified auth table name"
 msgstr ""
 
+#: ../plugin/auth_schema/module.cc:79
+msgid "Authentication against a table with encrypted passwords"
+msgstr ""
+
+#: ../plugin/auth_test/auth_test.cc:115
+msgid "Authentication module for testing"
+msgstr ""
+
+#: ../plugin/benchmark/benchmarkudf.cc:134
+msgid "BENCHMARK function"
+msgstr ""
+
+#: ../plugin/catalog/module.cc:44
+msgid "Catalog system and functions"
+msgstr ""
+
+#: ../plugin/charlength/charlength.cc:86
+msgid "CHAR_LENGTH and CHARACTER_LENGTH functions"
+msgstr ""
+
+#: ../plugin/coercibility_function/coercibility_function.cc:81
+msgid "COERCIBILITY function"
+msgstr ""
+
+#: ../plugin/collation_dictionary/dictionary.cc:46
+msgid "Character set and collation dictionaries"
+msgstr ""
+
+#: ../plugin/compression/compressionudf.cc:50
+msgid "COMPRESS and UNCOMPRESS functions"
+msgstr ""
+
+#: ../plugin/connection_id/connection_id.cc:86
+msgid "CONNECTION_ID function"
+msgstr ""
+
 #: ../plugin/console/console.cc:323
 #, c-format
 msgid "pipe() failed with errno %d"
@@ -3989,6 +4045,22 @@
 msgid "Default schema to use."
 msgstr ""
 
+#: ../plugin/console/console.cc:379
+msgid "Console client"
+msgstr ""
+
+#: ../plugin/crc32/crc32udf.cc:86
+msgid "CRC32 function"
+msgstr ""
+
+#: ../plugin/debug/module.cc:154
+msgid "Debug functions"
+msgstr ""
+
+#: ../plugin/default_replicator/default_replicator.cc:75
+msgid "Replicates all write events to all appliers"
+msgstr ""
+
 #: ../plugin/drizzle_protocol/drizzle_protocol.cc:88
 msgid ""
 "Port number to use for connection or 0 for default to with Drizzle/MySQL "
@@ -4031,8 +4103,16 @@
 msgid "Maximum simultaneous connections."
 msgstr ""
 
+#: ../plugin/drizzle_protocol/drizzle_protocol.cc:121
+msgid "Drizzle network protocol"
+msgstr ""
+
 #: ../plugin/errmsg_stderr/errmsg_stderr.cc:74
-msgid "Error Messages to stderr"
+msgid "Prints error messages to STDERR"
+msgstr ""
+
+#: ../plugin/error_dictionary/dictionary.cc:41
+msgid "Dictionary of Drizzle errors codes and messages"
 msgstr ""
 
 #: ../plugin/filtered_replicator/filtered_replicator.cc:545
@@ -4051,6 +4131,22 @@
 msgid "Regular expression to apply to tables to exclude"
 msgstr ""
 
+#: ../plugin/filtered_replicator/filtered_replicator.cc:565
+msgid "Replicates events filtered by schema or table name"
+msgstr ""
+
+#: ../plugin/function_dictionary/dictionary.cc:40
+msgid "Dictionary of functions"
+msgstr ""
+
+#: ../plugin/function_engine/function.cc:144
+msgid "Function engine"
+msgstr ""
+
+#: ../plugin/gearman_udf/gearman_udf.cc:60
+msgid "Gearman client"
+msgstr ""
+
 #: ../plugin/hello_events/hello_events.cc:402
 msgid "Enable Example Events Plugin"
 msgstr ""
@@ -4072,8 +4168,32 @@
 msgid "After drop database event observer call position"
 msgstr ""
 
+#. DRIZZLE_VERSION_ID
+#. module name
+#. module version
+#. author(s)
 #: ../plugin/hello_events/hello_events.cc:428
-msgid "An example events Plugin"
+msgid "Example EventObserver plugin"
+msgstr ""
+
+#. DRIZZLE_VERSION_ID
+#. module name
+#. module version
+#. author(s)
+#: ../plugin/hello_world/hello_world.cc:63
+msgid "Example Function plugin"
+msgstr ""
+
+#: ../plugin/hex_functions/hex_functions.cc:185
+msgid "HEX and UNHEX functions"
+msgstr ""
+
+#: ../plugin/http_functions/http_functions.cc:192
+msgid "HTTP_GET and HTTP_POST functions"
+msgstr ""
+
+#: ../plugin/information_schema_dictionary/dictionary.cc:100
+msgid "The INFORMATION_SCHEMA"
 msgstr ""
 
 #: ../plugin/innobase/handler/data_dictionary.cc:760
@@ -4081,53 +4201,55 @@
 msgid "Warning: data in %s truncated due to memory limit of %d bytes\n"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:1976
+#: ../plugin/innobase/handler/ha_innodb.cc:1978
 msgid ""
 "Once InnoDB is running, innodb_commit_concurrency must not change between "
 "zero and nonzero."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:2346
+#: ../plugin/innobase/handler/ha_innodb.cc:2348
 msgid ""
 "syntax error in innodb_log_group_home_dir, or a wrong number of mirrored log "
 "groups"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:2390
+#: ../plugin/innobase/handler/ha_innodb.cc:2392
 #, c-format
 msgid ""
 "InnoDB: invalid innodb_file_format_max value: should be any value up to %s "
 "or its equivalent numeric id"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9409
+#: ../plugin/innobase/handler/ha_innodb.cc:9414
 msgid "Do not use Native AIO library for IO, even if available"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9450
+#: ../plugin/innobase/handler/ha_innodb.cc:9455
 msgid "Enable internal replication log."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9453
+#: ../plugin/innobase/handler/ha_innodb.cc:9458
+#: ../plugin/rabbitmq/rabbitmq_log.cc:179 ../plugin/zeromq/zeromq_log.cc:149
+msgid "Name of the replicator plugin to use (default='default_replicator')"
+msgstr ""
+
+#: ../plugin/innobase/handler/ha_innodb.cc:9461
 msgid ""
 "Timeout in seconds an InnoDB transaction may wait for a lock before being "
 "rolled back. Values above 100000000 disable the timeout."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9456
+#: ../plugin/innobase/handler/ha_innodb.cc:9464
 msgid "Percentage of the buffer pool to reserve for 'old' blocks."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9459
+#: ../plugin/innobase/handler/ha_innodb.cc:9467
 msgid ""
 "ove blocks to the 'new' end of the buffer pool if the first access was at "
 "least this many milliseconds ago. The timeout is disabled if 0 (the default)."
 msgstr ""
 
 #: ../plugin/innobase/handler/replication_dictionary.cc:125
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:167
-#: ../plugin/transaction_log/print_transaction_message.cc:173
-#: ../plugin/transaction_log/transaction_log_reader.cc:156
 #, c-format
 msgid "Unable to parse transaction. Got error: %s.\n"
 msgstr ""
@@ -4414,10 +4536,26 @@
 "Path to special datafile for doublewrite buffer. (default is : not used)"
 msgstr ""
 
+#: ../plugin/ipv6_function/ipv6_function.cc:99
+msgid "IPV6 function"
+msgstr ""
+
+#: ../plugin/js/js.cc:364
+msgid "Executes JavaScript code with supplied arguments"
+msgstr ""
+
 #: ../plugin/json_server/json_server.cc:359
 msgid "Port number to use for connection or 0 for default (port 8086) "
 msgstr ""
 
+#: ../plugin/json_server/json_server.cc:371
+msgid "JSON HTTP interface"
+msgstr ""
+
+#: ../plugin/length/length.cc:83
+msgid "LENGTH and OCTET_LENGTH functions"
+msgstr ""
+
 #: ../plugin/logging_gearman/logging_gearman.cc:186
 msgid "fail gearman_client_create()"
 msgstr ""
@@ -4436,7 +4574,7 @@
 msgstr ""
 
 #: ../plugin/logging_gearman/logging_gearman.cc:315
-msgid "Log queries to a Gearman server"
+msgid "Logs queries to a Gearman server"
 msgstr ""
 
 #: ../plugin/logging_query/logging_query.cc:180
@@ -4469,7 +4607,7 @@
 msgstr ""
 
 #: ../plugin/logging_query/logging_query.cc:347
-msgid "Log queries to a CSV file"
+msgid "Logs queries to a CSV file"
 msgstr ""
 
 #: ../plugin/logging_stats/logging_stats.cc:317
@@ -4489,13 +4627,25 @@
 msgstr ""
 
 #: ../plugin/logging_stats/logging_stats.cc:333
-msgid "User Statistics as DATA_DICTIONARY tables"
+msgid "Dictionaries for user statistics"
+msgstr ""
+
+#: ../plugin/math_functions/functions.cc:73
+msgid "Math functions (ABS, LOG, POW, LN, SQRT, CEIL, FLOOR, ORD, etc.)"
 msgstr ""
 
 #: ../plugin/md5/md5.cc:94
 msgid "libgcrypt library version mismatch"
 msgstr ""
 
+#: ../plugin/md5/md5.cc:113
+msgid "MD5 function"
+msgstr ""
+
+#: ../plugin/memcached_functions/memcached_functions.cc:356
+msgid "Memcached functions"
+msgstr ""
+
 #: ../plugin/memcached_stats/analysis_table.cc:78
 #: ../plugin/memcached_stats/stats_table.cc:144
 msgid "No value in MEMCACHED_STATS_SERVERS variable."
@@ -4506,7 +4656,7 @@
 msgstr ""
 
 #: ../plugin/memcached_stats/memcached_stats.cc:98
-msgid "Memcached Stats as I_S tables"
+msgid "Dictionary of memcached statistics"
 msgstr ""
 
 #: ../plugin/memcached_stats/stats_table.cc:74
@@ -4527,6 +4677,10 @@
 "memcached_servers_parse(%s)."
 msgstr ""
 
+#: ../plugin/memory/ha_heap.cc:849
+msgid "MEMORY storage engine"
+msgstr ""
+
 #: ../plugin/multi_thread/multi_thread.cc:64
 msgid "Session killed before thread could execute"
 msgstr ""
@@ -4539,6 +4693,10 @@
 msgid "Maximum number of user threads available."
 msgstr ""
 
+#: ../plugin/multi_thread/multi_thread.cc:212
+msgid "Multi-thread scheduler"
+msgstr ""
+
 #: ../plugin/myisam/ha_myisam.cc:525
 #, c-format
 msgid "Got an error from thread_id=%<PRIu64>, %s:%d"
@@ -4565,6 +4723,10 @@
 "when creating indexes with CREATE INDEX or ALTER TABLE."
 msgstr ""
 
+#: ../plugin/myisam/ha_myisam.cc:1517
+msgid "MyISAM storage engine: non-transactional, legacy, deprecated"
+msgstr ""
+
 #: ../plugin/myisam/my_handler_errors.cc:42
 msgid "Didn't find key on read or update"
 msgstr ""
@@ -4805,6 +4967,10 @@
 "Port number to use for connection or 0 for default to with MySQL protocol."
 msgstr ""
 
+#: ../plugin/mysql_protocol/mysql_protocol.cc:963
+msgid "MySQL network protocol"
+msgstr ""
+
 #: ../plugin/mysql_unix_socket_protocol/protocol.cc:78
 msgid ""
 " exists already. Do you have another Drizzle or MySQL running? Or perhaps "
@@ -4824,6 +4990,18 @@
 msgid "Clobber socket file if one is there already."
 msgstr ""
 
+#: ../plugin/mysql_unix_socket_protocol/protocol.cc:174
+msgid "MySQL Unix socket protocol"
+msgstr ""
+
+#: ../plugin/performance_dictionary/dictionary.cc:40
+msgid "Dictionary of session usage and performance"
+msgstr ""
+
+#: ../plugin/protocol_dictionary/dictionary.cc:89
+msgid "Dictionary of protocol counters"
+msgstr ""
+
 #: ../plugin/query_log/module.cc:83
 msgid "The query log file name must be defined."
 msgstr ""
@@ -4865,6 +5043,10 @@
 msgid "Threshold for logging queries that are active too long, in seconds"
 msgstr ""
 
+#: ../plugin/query_log/module.cc:293
+msgid "Logs queries to a file"
+msgstr ""
+
 #: ../plugin/rabbitmq/rabbitmq_handler.cc:115
 msgid "Could not open socket, is rabbitmq running?"
 msgstr ""
@@ -4888,102 +5070,175 @@
 msgid "Failed to allocate the RabbitMQHandler.  Got error: %s\n"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:141
+#: ../plugin/rabbitmq/rabbitmq_log.cc:140
 #, c-format
 msgid "Failed to allocate the RabbitMQLog instance.  Got error: %s\n"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:165
+#: ../plugin/rabbitmq/rabbitmq_log.cc:164
 msgid "Host name to connect to"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:168
+#: ../plugin/rabbitmq/rabbitmq_log.cc:167
 msgid "Port to connect to"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:171
+#: ../plugin/rabbitmq/rabbitmq_log.cc:170
 msgid "RabbitMQ virtualhost"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:174
+#: ../plugin/rabbitmq/rabbitmq_log.cc:173
 msgid "RabbitMQ username"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:177
+#: ../plugin/rabbitmq/rabbitmq_log.cc:176
 msgid "RabbitMQ password"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:180
-#: ../plugin/transaction_log/module.cc:239 ../plugin/zeromq/zeromq_log.cc:149
-msgid "Name of the replicator plugin to use (default='default_replicator')"
-msgstr ""
-
-#: ../plugin/rabbitmq/rabbitmq_log.cc:183
+#: ../plugin/rabbitmq/rabbitmq_log.cc:182
 msgid "Name of RabbitMQ exchange to publish to"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:186
+#: ../plugin/rabbitmq/rabbitmq_log.cc:185
 msgid "Name of RabbitMQ routing key to use"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:48
+#: ../plugin/rabbitmq/rabbitmq_log.cc:196
+msgid "Publishes transactions to RabbitMQ"
+msgstr ""
+
+#: ../plugin/rand_function/rand_function.cc:135
+msgid "RAND function"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:54
+msgid "max-cache-buckets is too low, must be greater than 0"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:60
+msgid "max-lru-length is too low, must be greater than 0"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:66
 #, c-format
 msgid "Could not load regex policy file: %s\n"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:49
+#: ../plugin/regex_policy/module.cc:67
 msgid "Unknown"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:64
+#: ../plugin/regex_policy/module.cc:82
 msgid "File to load for regex authorization policies"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:220
+#: ../plugin/regex_policy/module.cc:85
+msgid "Maximum buckets for authorization cache"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:88
+msgid "Maximum number of LRU entries to track at once"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:241
 #, c-format
 msgid "User %s matches regex\n"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:223
+#: ../plugin/regex_policy/module.cc:244
 #, c-format
 msgid "Object %s matches regex %s (%s)\n"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:229
+#: ../plugin/regex_policy/module.cc:250
 #, c-format
 msgid "Object %s NOT restricted by regex %s (%s)\n"
 msgstr ""
 
+#: ../plugin/regex_policy/module.cc:342
+#, c-format
+msgid ""
+"Unable to reduce size of cache below max buckets (current buckets=%<PRIu64>)"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:366
+msgid "Authorization using a regex-matched policy file"
+msgstr ""
+
+#: ../plugin/registry_dictionary/dictionary.cc:46
+msgid "Dictionaries of modules and plugins"
+msgstr ""
+
+#: ../plugin/reverse_function/reverse_function.cc:106
+msgid "REVERSE function"
+msgstr ""
+
+#: ../plugin/schema_dictionary/dictionary.cc:45
+msgid "Dictionaries of schemas, tables, indexes, etc."
+msgstr ""
+
+#: ../plugin/schema_engine/plugin.cc:45
+msgid "Schema engine"
+msgstr ""
+
+#: ../plugin/session_dictionary/dictionary.cc:42
+msgid "Dictionaries of session variables and statements"
+msgstr ""
+
 #: ../plugin/session_dictionary/processlist.cc:73
 #: ../plugin/session_dictionary/sessions.cc:77
 msgid "no user"
 msgstr ""
 
-#: ../plugin/simple_user_policy/module.cc:46
+#: ../plugin/show_dictionary/plugin.cc:46
+msgid "Dictionary of SHOW commands"
+msgstr ""
+
+#: ../plugin/show_schema_proto/show_schema_proto.cc:111
+msgid "Shows text representation of schema definition proto"
+msgstr ""
+
+#: ../plugin/shutdown_function/shutdown.cc:85
+msgid "SHUTDOWN function"
+msgstr ""
+
+#: ../plugin/signal_handler/signal_handler.cc:262
+msgid "Signal handler"
+msgstr ""
+
+#: ../plugin/simple_user_policy/module.cc:47
 msgid ""
 "Remap '.' to another character/string when controlling access to a schema. "
 "Useful for usernames that have a '.' in them. If a '.' is remapped to an "
 "underscore, you don't have to quote the schema name."
 msgstr ""
 
+#: ../plugin/simple_user_policy/module.cc:58
+msgid "Authorization matching username to schema object name"
+msgstr ""
+
 #: ../plugin/slave/module.cc:56
 msgid "Path to the slave configuration file"
 msgstr ""
 
+#: ../plugin/slave/module.cc:67
+msgid "Drizzle replication slave"
+msgstr ""
+
 #: ../plugin/slave/queue_producer.cc:116
 #, fuzzy
 msgid "Lost connection to master. Reconnecting."
 msgstr "الرجاء الإنتظار ، وإعادة محاولة الإتصال إن فشل في الإتصال"
 
 #: ../plugin/slave/queue_producer.cc:143 ../plugin/slave/queue_producer.cc:152
-#: ../plugin/slave/queue_producer.cc:166 ../plugin/slave/queue_producer.cc:258
-#: ../plugin/slave/queue_producer.cc:270 ../plugin/slave/queue_producer.cc:287
-#: ../plugin/slave/queue_producer.cc:430 ../plugin/slave/queue_producer.cc:444
+#: ../plugin/slave/queue_producer.cc:166 ../plugin/slave/queue_producer.cc:262
+#: ../plugin/slave/queue_producer.cc:274 ../plugin/slave/queue_producer.cc:291
+#: ../plugin/slave/queue_producer.cc:434 ../plugin/slave/queue_producer.cc:448
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../plugin/slave/queue_producer.cc:456
+#: ../plugin/slave/queue_producer.cc:460
 msgid "Replication slave: Unable to insert into queue."
 msgstr ""
 
@@ -4992,13 +5247,33 @@
 msgid "Could not start slave services: %s\n"
 msgstr ""
 
-#: ../plugin/slave/sql_executor.cc:91
+#: ../plugin/slave/sql_executor.cc:93
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
+#: ../plugin/sleep/sleep.cc:133
+msgid "SLEEP function"
+msgstr ""
+
+#: ../plugin/status_dictionary/dictionary.cc:47
+msgid "Dictionaries of global and session variables"
+msgstr ""
+
+#: ../plugin/storage_engine_api_tester/storage_engine_api_tester.cc:718
+msgid "StorageEngine module for testing call order"
+msgstr ""
+
+#: ../plugin/string_functions/functions.cc:45
+msgid "String functions"
+msgstr ""
+
+#: ../plugin/substr_functions/substr_functions.cc:279
+msgid "SUBSTR and SUBSTR functions"
+msgstr ""
+
 #: ../plugin/syslog/errmsg.cc:40 ../plugin/syslog/logging.cc:56
 #, c-format
 msgid "syslog facility \"%s\" not known, using \"local0\""
@@ -5028,226 +5303,50 @@
 msgid "Syslog Priority of error messages"
 msgstr ""
 
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:106
-#: ../plugin/transaction_log/print_transaction_message.cc:106
-#: ../plugin/transaction_log/transaction_log_reader.cc:94
-msgid "Failed to open transaction log file"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:147
-#: ../plugin/transaction_log/transaction_log_reader.cc:147
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:153
-#, c-format
-msgid "Could not read transaction message.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:148
-#: ../plugin/transaction_log/transaction_log_reader.cc:148
-#, c-format
-msgid "GPB ERROR: %s.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:149
-#: ../plugin/transaction_log/transaction_log_reader.cc:149
-#, c-format
-msgid "Raw buffer read: %s.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:169
-#: ../plugin/transaction_log/print_transaction_message.cc:175
-#: ../plugin/transaction_log/transaction_log_reader.cc:158
-#, c-format
-msgid "BUFFER: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:169
-msgid "Failed to allocate the TransactionLog instance"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:177
-#, c-format
-msgid "Failed to initialize the Transaction Log.  Got error: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:188
-#, c-format
-msgid "Failed to initialize the Transaction Log Index.  Got error: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:227
-msgid "DEBUGGING - Truncate transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:230
-msgid "Enable CRC32 Checksumming of each written transaction log entry"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:233
-msgid "Enable transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:236
-msgid "Path to the file to use for transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:242
-msgid ""
-"0 == rely on operating system to sync log file (default), 1 == sync file at "
-"each transaction write, 2 == sync log file once per second"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:245
-msgid "Number of slots for in-memory write buffers (default=8)."
-msgstr ""
-
-#: ../plugin/transaction_log/print_transaction_message.cc:134
-#, c-format
-msgid "GPB message is not a valid type.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/print_transaction_message.cc:154
-#, c-format
-msgid "GPB message is not a valid size.\n"
-msgstr ""
-
-#. 120 was arbitrary
-#: ../plugin/transaction_log/print_transaction_message.cc:167
-msgid "Could not read transaction message. Raw buffer read "
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log.cc:114
-msgid "Failed to open transaction log file "
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log.cc:215
-#, c-format
-msgid ""
-"Failed to write full size of log entry.  Tried to write %<PRId64> bytes at "
-"offset %<PRId64>, but only wrote %<PRId32> bytes.  Error: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log.cc:233
-msgid "Failed to sync log file."
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log_reader.cc:114
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:118
-#, c-format
-msgid "Attempted to read record bigger than INT_MAX\n"
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log_reader.cc:134
-#, c-format
-msgid "Memory allocation failure trying to allocate %<PRIu64> bytes.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log_reader.cc:169
-#, c-format
-msgid "Checksum failed. Wanted %<PRIu32> got %<PRIu32>\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:65
-msgid "Cannot open file: "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:75
-msgid "Could not skip to position "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:112
-msgid "Found a non-transaction message in log. Currently, not supported.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:138
-msgid "Memory allocation failure trying to allocate "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:140
-msgid " bytes\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:154
-msgid "GPB ERROR: "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:160
-msgid ""
-"HEXDUMP:\n"
-"\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:168
-msgid "Unable to parse command. Got error: "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:177
-msgid ""
-"\n"
-"HEXDUMP:\n"
-"\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:645
-#, fuzzy
-msgid "Display help and exit"
-msgstr "إظهار هذه المساعدة."
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:646
-msgid "Read from the innodb transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:652
-msgid "Password to use when connecting to server"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:655
-msgid "Perform checksum"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:656
-msgid "Ignore event messages"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:657
-msgid "Transaction log file"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:658
-msgid "Print raw Protobuf messages instead of SQL"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:661
-msgid "Start reading from the given file position"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:664
-msgid "Only output for the given transaction ID and later"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:667
-msgid "Only output for the given transaction ID"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:668
-msgid "Summarize message contents"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:702
-msgid "Cannot use --start-pos and --transaction-id together\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:708
-msgid "Cannot use --summarize with either --raw or --transaction-id\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:826
-msgid "Checksum failed. Wanted "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:828
-msgid " got "
+#: ../plugin/syslog/module.cc:130
+msgid "Logs error messages and queries to syslog"
+msgstr ""
+
+#: ../plugin/table_cache_dictionary/dictionary.cc:46
+msgid "Dictionaries of table cache and table definition cache"
+msgstr ""
+
+#: ../plugin/tableprototester/tableprototester.cc:365
+msgid "StorageEngine module for testing table proto messages"
+msgstr ""
+
+#: ../plugin/trigger_dictionary/module.cc:39
+msgid "Dictionary of triggers"
+msgstr ""
+
+#: ../plugin/user_locks/module.cc:58
+msgid "User-level locking and barrier functions"
+msgstr ""
+
+#: ../plugin/utility_dictionary/dictionary.cc:42
+msgid "Utility dictionaries"
+msgstr ""
+
+#: ../plugin/utility_functions/functions.cc:51
+msgid "Utility functions"
+msgstr ""
+
+#: ../plugin/uuid_function/uuid_function.cc:85
+msgid "UUID function using libuuid"
+msgstr ""
+
+#: ../plugin/version/versionudf.cc:69
+msgid "VERSION function"
 msgstr ""
 
 #: ../plugin/zeromq/zeromq_log.cc:146
 msgid "End point to bind to"
 msgstr ""
+
+#: ../plugin/zeromq/zeromq_log.cc:161
+msgid "Publishes transactions to ZeroMQ"
+msgstr ""
+
+#, fuzzy
+#~ msgid "Display help and exit"
+#~ msgstr "إظهار هذه المساعدة."

=== modified file 'po/bn.po'
--- po/bn.po	2012-02-15 14:37:56 +0000
+++ po/bn.po	2012-04-20 19:19:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: drizzle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 20:06+0530\n"
+"POT-Creation-Date: 2012-03-23 19:48+0530\n"
 "PO-Revision-Date: 2010-12-14 00:33+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bengali <[e-mail]>\n"
@@ -334,7 +334,7 @@
 msgid "Ping the server to check if it's alive."
 msgstr ""
 
-#: ../client/drizzle.cc:1421 ../drizzled/drizzled.cc:1064
+#: ../client/drizzle.cc:1421 ../drizzled/drizzled.cc:1115
 msgid "Configuration file defaults are not used if no-defaults is set"
 msgstr ""
 
@@ -484,7 +484,6 @@
 msgstr ""
 
 #: ../client/drizzle.cc:1487 ../client/drizzledump.cc:548
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:648
 msgid "User for login if not current user."
 msgstr ""
 
@@ -1020,8 +1019,7 @@
 #: ../client/drizzledump.cc:506
 msgid ""
 "Give less verbose output (useful for debugging). Disables structure comments "
-"and header/footer constructs.  Enables options --skip-add-drop-table --no-"
-"set-names --skip-disable-keys"
+"and header/footer constructs.  Enables option --skip-disable-keys"
 msgstr ""
 
 #: ../client/drizzledump.cc:508
@@ -1115,12 +1113,10 @@
 msgstr ""
 
 #: ../client/drizzledump.cc:546
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:650
 msgid "Port number to use for connection."
 msgstr ""
 
 #: ../client/drizzledump.cc:550
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:654
 msgid "The protocol of connection (mysql or drizzle)."
 msgstr ""
 
@@ -1258,411 +1254,411 @@
 msgid "Could not open '%s' for reading: errno = %d"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:356
+#: ../drizzled/drizzled.cc:359
 msgid "General Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:357
+#: ../drizzled/drizzled.cc:360
 msgid "Config File Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:358
+#: ../drizzled/drizzled.cc:361
 msgid "Kernel Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:359
+#: ../drizzled/drizzled.cc:362
 msgid "Plugin Loading Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:360
+#: ../drizzled/drizzled.cc:363
 msgid "Plugin Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:361
+#: ../drizzled/drizzled.cc:364
 msgid "Config and Plugin Loading"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:362
+#: ../drizzled/drizzled.cc:365
 msgid "Kernel and Plugin Loading and Plugin"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:476
+#: ../drizzled/drizzled.cc:509
 msgid "Aborting:"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:534
+#: ../drizzled/drizzled.cc:571
 msgid "One can only use the --user switch if running as root"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:541
+#: ../drizzled/drizzled.cc:578
 msgid ""
 "drizzled cannot be run as root, use --user to start drizzled up as another "
 "user"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:584
+#: ../drizzled/drizzled.cc:628
 msgid "Set process group ID failed "
 msgstr ""
 
-#: ../drizzled/drizzled.cc:588
+#: ../drizzled/drizzled.cc:632
 msgid "Set process user ID failed"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:599
+#: ../drizzled/drizzled.cc:643
 msgid "Process chroot failed"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:698
+#: ../drizzled/drizzled.cc:742
 msgid "Invalid Value for auto_increment_increment"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:708
+#: ../drizzled/drizzled.cc:752
 msgid "Invalid Value for auto_increment_offset"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:718
+#: ../drizzled/drizzled.cc:762
 msgid "Invalid Value for completion_type"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:729
+#: ../drizzled/drizzled.cc:773
 msgid "Invalid Value for div-precision-increment"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:739
+#: ../drizzled/drizzled.cc:783
 msgid "Invalid Value for group_concat_max_len"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:749
+#: ../drizzled/drizzled.cc:793
 msgid "Invalid Value for join_buffer_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:760
+#: ../drizzled/drizzled.cc:804
 msgid "Invalid Value for max_allowed_packet"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:771
+#: ../drizzled/drizzled.cc:815
 msgid "Invalid Value for max_error_count"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:781
+#: ../drizzled/drizzled.cc:825
 msgid "Invalid Value for max_heap_table_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:792
+#: ../drizzled/drizzled.cc:836
 msgid "Invalid Value for min_examined_row_limit"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:802
+#: ../drizzled/drizzled.cc:846
 msgid "Invalid Value for max_join_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:812
+#: ../drizzled/drizzled.cc:856
 msgid "Invalid Value for max_length_for_sort_data"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:822
+#: ../drizzled/drizzled.cc:866
 msgid "Invalid Value for max_seeks_for_key"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:832
+#: ../drizzled/drizzled.cc:876
 msgid "Invalid Value for max_sort_length"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:842
+#: ../drizzled/drizzled.cc:886
 msgid "Invalid Value for optimizer_search_depth"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:852
+#: ../drizzled/drizzled.cc:896
 msgid "Invalid Value for preload_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:862
+#: ../drizzled/drizzled.cc:906
 msgid "Invalid Value for query_alloc_block_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:873
+#: ../drizzled/drizzled.cc:917
 msgid "Invalid Value for query_prealloc_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:884
+#: ../drizzled/drizzled.cc:928
 msgid "Invalid Value for range_alloc_block_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:895
+#: ../drizzled/drizzled.cc:939
 msgid "Invalid Value for read_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:906
+#: ../drizzled/drizzled.cc:950
 msgid "Invalid Value for read_rnd_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:916
+#: ../drizzled/drizzled.cc:960
 msgid "Invalid Value for sort_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:926
+#: ../drizzled/drizzled.cc:970
 msgid "Invalid Value for table_def_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:936
+#: ../drizzled/drizzled.cc:980
 msgid "Invalid Value for table_cache_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:946 ../drizzled/drizzled.cc:961
+#: ../drizzled/drizzled.cc:990 ../drizzled/drizzled.cc:1005
 msgid "Invalid Value for table_lock_wait_timeout"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:971
+#: ../drizzled/drizzled.cc:1015
 msgid ""
 "Invalid Value for transaction_message_threshold valid values are between "
 "131072 - 1048576 bytes"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1039
+#: ../drizzled/drizzled.cc:1090
 #, c-format
 msgid "gethostname failed, using '%s' as hostname"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1053
+#: ../drizzled/drizzled.cc:1104
 msgid "Display help and exit."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1055
+#: ../drizzled/drizzled.cc:1106
 msgid "Run as a daemon."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1057 ../drizzled/drizzled.cc:1670
+#: ../drizzled/drizzled.cc:1108 ../drizzled/drizzled.cc:1724
 msgid "Run drizzled daemon as user."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1059
+#: ../drizzled/drizzled.cc:1110
 msgid "Print version information and exit."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1066
+#: ../drizzled/drizzled.cc:1117
 msgid "Configuration file to use"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1068
+#: ../drizzled/drizzled.cc:1119
 msgid "Base location for config files"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1070 ../drizzled/drizzled.cc:1762
+#: ../drizzled/drizzled.cc:1121 ../drizzled/drizzled.cc:1816
 msgid "Directory for plugins."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1075 ../drizzled/drizzled.cc:1766
+#: ../drizzled/drizzled.cc:1126 ../drizzled/drizzled.cc:1820
 msgid ""
 "Optional comma separated list of plugins to load at startup in addition to "
 "the default list of plugins. [for example: --plugin_add=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1079 ../drizzled/drizzled.cc:1772
+#: ../drizzled/drizzled.cc:1130 ../drizzled/drizzled.cc:1826
 msgid ""
 "Optional comma separated list of plugins to not load at startup. Effectively "
 "removes a plugin from the list of plugins to be loaded. [for example: --"
 "plugin_remove=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1083 ../drizzled/drizzled.cc:1778
+#: ../drizzled/drizzled.cc:1134 ../drizzled/drizzled.cc:1832
 msgid ""
 "Optional comma separated list of plugins to load at starup instead of the "
 "default plugin load list. [for example: --plugin_load=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1090 ../drizzled/drizzled.cc:1582
+#: ../drizzled/drizzled.cc:1141 ../drizzled/drizzled.cc:1636
 msgid "Auto-increment columns are incremented by this"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1092 ../drizzled/drizzled.cc:1587
+#: ../drizzled/drizzled.cc:1143 ../drizzled/drizzled.cc:1641
 msgid ""
 "Offset added to Auto-increment columns. Used when auto-increment-increment !"
 "= 1"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1094 ../drizzled/drizzled.cc:1593
+#: ../drizzled/drizzled.cc:1145 ../drizzled/drizzled.cc:1647
 msgid ""
 "Path to installation directory. All paths are usually resolved relative to "
 "this."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1097 ../drizzled/drizzled.cc:1598
+#: ../drizzled/drizzled.cc:1148 ../drizzled/drizzled.cc:1652
 msgid "Chroot drizzled daemon during startup."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1099
+#: ../drizzled/drizzled.cc:1150
 msgid "Set the default collation."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1101 ../drizzled/drizzled.cc:1602
+#: ../drizzled/drizzled.cc:1152 ../drizzled/drizzled.cc:1656
 msgid "Default completion type."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1102 ../drizzled/drizzled.cc:1607
+#: ../drizzled/drizzled.cc:1153 ../drizzled/drizzled.cc:1661
 msgid "Write core on errors."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1104 ../drizzled/drizzled.cc:1611
+#: ../drizzled/drizzled.cc:1155 ../drizzled/drizzled.cc:1665
 #: ../plugin/innobase/xtrabackup/xtrabackup.cc:4772
 msgid "Path to the database root."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1106
+#: ../drizzled/drizzled.cc:1157
 msgid "Set the default storage engine for tables."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1108
+#: ../drizzled/drizzled.cc:1159
 msgid "Set the default time zone."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1110 ../drizzled/drizzled.cc:1615
+#: ../drizzled/drizzled.cc:1161 ../drizzled/drizzled.cc:1669
 msgid "Used for debugging;  Use at your own risk!"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1112 ../drizzled/drizzled.cc:1620
+#: ../drizzled/drizzled.cc:1163 ../drizzled/drizzled.cc:1674
 msgid "Set up signals usable for debugging"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1114
+#: ../drizzled/drizzled.cc:1165
 msgid "Set the language used for the month names and the days of the week."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1116 ../drizzled/drizzled.cc:1624
+#: ../drizzled/drizzled.cc:1167 ../drizzled/drizzled.cc:1678
 msgid "Log some not critical warnings to the log file."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1118 ../drizzled/drizzled.cc:1629
+#: ../drizzled/drizzled.cc:1169 ../drizzled/drizzled.cc:1683
 msgid "Pid file used by drizzled."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1120
+#: ../drizzled/drizzled.cc:1171
 msgid "Maximum time in seconds to wait for the port to become free. "
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1122
+#: ../drizzled/drizzled.cc:1173
 msgid "Include the SQL query in replicated protobuf messages."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1124 ../drizzled/drizzled.cc:1638
+#: ../drizzled/drizzled.cc:1175 ../drizzled/drizzled.cc:1692
 msgid ""
 "Limit LOAD DATA, SELECT ... OUTFILE, and LOAD_FILE() to files within "
 "specified directory"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1127 ../drizzled/drizzled.cc:1643
+#: ../drizzled/drizzled.cc:1178 ../drizzled/drizzled.cc:1697
 msgid ""
 "Uniquely identifies the server instance in the community of replication "
 "partners."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1130 ../drizzled/drizzled.cc:1648
+#: ../drizzled/drizzled.cc:1181 ../drizzled/drizzled.cc:1702
 msgid "Don't print a stack trace on failure."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1132 ../drizzled/drizzled.cc:1652
+#: ../drizzled/drizzled.cc:1183 ../drizzled/drizzled.cc:1706
 msgid "Enable symbolic link support."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1134 ../drizzled/drizzled.cc:1661
+#: ../drizzled/drizzled.cc:1185 ../drizzled/drizzled.cc:1715
 msgid ""
 "Specify whether to time mutexes (only InnoDB mutexes are currently supported)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1137
+#: ../drizzled/drizzled.cc:1188
 msgid "Path for temporary files."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1139 ../drizzled/drizzled.cc:1666
+#: ../drizzled/drizzled.cc:1190 ../drizzled/drizzled.cc:1720
 msgid "Default transaction isolation level."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1141
+#: ../drizzled/drizzled.cc:1192
 msgid ""
 "Max message size written to transaction log, valid values 131072 - 1048576 "
 "bytes."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1143 ../drizzled/drizzled.cc:1674
+#: ../drizzled/drizzled.cc:1194 ../drizzled/drizzled.cc:1728
 msgid ""
 "The number of outstanding connection requests Drizzle can have. This comes "
 "into play when the main Drizzle thread gets very many connection requests in "
 "a very short time."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1148 ../drizzled/drizzled.cc:1680
+#: ../drizzled/drizzled.cc:1199 ../drizzled/drizzled.cc:1734
 msgid ""
 "Size of tree cache used in bulk insert optimization. Note that this is a "
 "limit per thread!"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1151 ../drizzled/drizzled.cc:1686
+#: ../drizzled/drizzled.cc:1202 ../drizzled/drizzled.cc:1740
 msgid ""
 "Precision of the result of '/' operator will be increased on that value."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1154
+#: ../drizzled/drizzled.cc:1205
 msgid "The maximum length of the result of function  group_concat."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1156 ../drizzled/drizzled.cc:1692
+#: ../drizzled/drizzled.cc:1207 ../drizzled/drizzled.cc:1746
 msgid "The size of the buffer that is used for full joins."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1159
+#: ../drizzled/drizzled.cc:1210
 msgid ""
 "A global cap on the amount of memory that can be allocated by session join "
 "buffers (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1161 ../drizzled/drizzled.cc:1698
+#: ../drizzled/drizzled.cc:1212 ../drizzled/drizzled.cc:1752
 msgid "Max packetlength to send/receive from to server."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1163
+#: ../drizzled/drizzled.cc:1214
 msgid "Max number of errors/warnings to store for a statement."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1165 ../drizzled/drizzled.cc:1703
+#: ../drizzled/drizzled.cc:1216 ../drizzled/drizzled.cc:1757
 msgid "Don't allow creation of heap tables bigger than this."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1167 ../drizzled/drizzled.cc:1709
+#: ../drizzled/drizzled.cc:1218 ../drizzled/drizzled.cc:1763
 msgid ""
 "Joins that are probably going to read more than max_join_size records return "
 "an error."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1170 ../drizzled/drizzled.cc:1715
+#: ../drizzled/drizzled.cc:1221 ../drizzled/drizzled.cc:1769
 msgid "Max number of bytes in sorted records."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1172 ../drizzled/drizzled.cc:1720
+#: ../drizzled/drizzled.cc:1223 ../drizzled/drizzled.cc:1774
 msgid "Limit assumed max number of seeks when looking up rows based on a key"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1174 ../drizzled/drizzled.cc:1725
+#: ../drizzled/drizzled.cc:1225 ../drizzled/drizzled.cc:1779
 msgid ""
 "The number of bytes to use when sorting BLOB or TEXT values (only the first "
 "max_sort_length bytes of each value are used; the rest are ignored)."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1178 ../drizzled/drizzled.cc:1732
+#: ../drizzled/drizzled.cc:1229 ../drizzled/drizzled.cc:1786
 msgid "After this many write locks, allow some read locks to run in between."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1180 ../drizzled/drizzled.cc:1736
+#: ../drizzled/drizzled.cc:1231 ../drizzled/drizzled.cc:1790
 msgid ""
 "Don't log queries which examine less than min_examined_row_limit rows to "
 "file."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1183
+#: ../drizzled/drizzled.cc:1234
 msgid ""
 "Do not apply any heuristic(s) during query optimization to prune, thus "
 "perform an exhaustive search from the optimizer search space."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1186 ../drizzled/drizzled.cc:1750
+#: ../drizzled/drizzled.cc:1237 ../drizzled/drizzled.cc:1804
 msgid ""
 "Maximum depth of search performed by the query optimizer. Values larger than "
 "the number of relations in a query result in better query plans, but take "
@@ -1673,124 +1669,124 @@
 "(used for testing/comparison)."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1195 ../drizzled/drizzled.cc:1784
+#: ../drizzled/drizzled.cc:1246 ../drizzled/drizzled.cc:1838
 msgid "The size of the buffer that is allocated when preloading indexes"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1198 ../drizzled/drizzled.cc:1789
+#: ../drizzled/drizzled.cc:1249 ../drizzled/drizzled.cc:1843
 msgid "Allocation block size for query parsing and execution"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1201 ../drizzled/drizzled.cc:1794
+#: ../drizzled/drizzled.cc:1252 ../drizzled/drizzled.cc:1848
 msgid "Persistent buffer for query parsing and execution"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1204 ../drizzled/drizzled.cc:1800
+#: ../drizzled/drizzled.cc:1255 ../drizzled/drizzled.cc:1854
 msgid "Allocation block size for storing ranges during optimization"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1207 ../drizzled/drizzled.cc:1806
+#: ../drizzled/drizzled.cc:1258 ../drizzled/drizzled.cc:1860
 msgid ""
 "Each thread that does a sequential scan allocates a buffer of this size for "
 "each table it scans. If you do many sequential scans, you may want to "
 "increase this value."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1212
+#: ../drizzled/drizzled.cc:1263
 msgid "A global cap on the size of read-buffer-size (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1215 ../drizzled/drizzled.cc:1814
+#: ../drizzled/drizzled.cc:1266 ../drizzled/drizzled.cc:1868
 msgid ""
 "When reading rows in sorted order after a sort, the rows are read through "
 "this buffer to avoid a disk seeks. If not set, then it's set to the value of "
 "record_buffer."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1220
+#: ../drizzled/drizzled.cc:1271
 msgid "A global cap on the size of read-rnd-buffer-size (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1222
+#: ../drizzled/drizzled.cc:1273
 msgid "Select scheduler to be used (by default multi-thread)."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1225 ../drizzled/drizzled.cc:1823
+#: ../drizzled/drizzled.cc:1276 ../drizzled/drizzled.cc:1877
 msgid "Each thread that needs to do a sort allocates a buffer of this size."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1228
+#: ../drizzled/drizzled.cc:1279
 msgid ""
 "A global cap on the amount of memory that can be allocated by session sort "
 "buffers (0 means unlimited)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1230 ../drizzled/drizzled.cc:1829
+#: ../drizzled/drizzled.cc:1281 ../drizzled/drizzled.cc:1883
 msgid "The number of cached table definitions."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1232 ../drizzled/drizzled.cc:1833
+#: ../drizzled/drizzled.cc:1283 ../drizzled/drizzled.cc:1887
 msgid "The number of cached open tables."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1234 ../drizzled/drizzled.cc:1837
+#: ../drizzled/drizzled.cc:1285 ../drizzled/drizzled.cc:1891
 msgid ""
 "Timeout in seconds to wait for a table level lock before returning an error. "
 "Used only if the connection has active cursors."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1237 ../drizzled/drizzled.cc:1842
+#: ../drizzled/drizzled.cc:1288 ../drizzled/drizzled.cc:1896
 msgid "The stack size for each thread."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1240 ../drizzled/drizzled.cc:1848
+#: ../drizzled/drizzled.cc:1291 ../drizzled/drizzled.cc:1902
 msgid ""
 "If an internal in-memory temporary table exceeds this size, Drizzle will "
 "automatically convert it to an on-disk MyISAM table."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1243
+#: ../drizzled/drizzled.cc:1294
 msgid ""
 "The verbosity of messages from drizzled.  Possible values are INSPECT, INFO, "
 "WARN or ERROR"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1267
+#: ../drizzled/drizzled.cc:1318
 msgid "Duplicate entry for command line option"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1340
+#: ../drizzled/drizzled.cc:1391
 msgid "Failed to initialize plugins"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1409
+#: ../drizzled/drizzled.cc:1463
 msgid "Error getting default charset"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1423
+#: ../drizzled/drizzled.cc:1477
 msgid "Error setting collation"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1430
+#: ../drizzled/drizzled.cc:1484
 #, c-format
 msgid "Unknown locale: '%s'"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1477
+#: ../drizzled/drizzled.cc:1531
 msgid "No scheduler found"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1495
+#: ../drizzled/drizzled.cc:1549
 msgid "Unknown/unsupported storage engine: "
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1633
+#: ../drizzled/drizzled.cc:1687
 msgid ""
 "Maximum time in seconds to wait for the port to become free. (Default: no "
 "wait)"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1742
+#: ../drizzled/drizzled.cc:1796
 msgid ""
 "Controls the heuristic(s) applied during query optimization to prune less-"
 "promising partial plans from the optimizer search space. Meaning: false - do "
@@ -1798,7 +1794,7 @@
 "based on number of retrieved rows."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1869
+#: ../drizzled/drizzled.cc:1923
 msgid ""
 "Copyright (C) 2010-2011 Drizzle Developers, Copyright (C) 2008 Sun "
 "Microsystems\n"
@@ -1807,31 +1803,31 @@
 "\n"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1876
+#: ../drizzled/drizzled.cc:1930
 #, c-format
 msgid "Usage: %s [OPTIONS]\n"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1988
+#: ../drizzled/drizzled.cc:2042
 #, c-format
 msgid ""
 "Ignoring user change to '%s' because the user was set to '%s' earlier on the "
 "command line"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1998
+#: ../drizzled/drizzled.cc:2052
 msgid "sort-heap-threshold cannot be less than sort-buffer-size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:2009
+#: ../drizzled/drizzled.cc:2063
 msgid "join-heap-threshold cannot be less than join-buffer-size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:2020
+#: ../drizzled/drizzled.cc:2074
 msgid "read-rnd-threshold cannot be less than read-rnd-buffer-size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:2031
+#: ../drizzled/drizzled.cc:2085
 msgid "read-buffer-threshold cannot be less than read-buffer-size"
 msgstr ""
 
@@ -3822,7 +3818,7 @@
 "\n"
 msgstr ""
 
-#: ../drizzled/sql_table.cc:1862
+#: ../drizzled/sql_table.cc:1864
 #, c-format
 msgid "Unknown - internal error %d during operation"
 msgstr ""
@@ -3853,22 +3849,30 @@
 msgid "Got error %d when reading table '%s'"
 msgstr ""
 
-#: ../drizzled/table/instance/base.cc:1735
+#: ../drizzled/table/instance/base.cc:1734
 #, c-format
 msgid "Unknown collation '%s' in table '%-.64s' definition"
 msgstr ""
 
-#: ../drizzled/table/instance/base.cc:1740
+#: ../drizzled/table/instance/base.cc:1739
 #, c-format
 msgid ""
 "Table '%-.64s' was created with a different version of Drizzle and cannot be "
 "read"
 msgstr ""
 
+#: ../plugin/ascii/ascii.cc:86
+msgid "ASCII function"
+msgstr ""
+
 #: ../plugin/auth_all/auth_all.cc:84
 msgid "Allow anonymous access"
 msgstr ""
 
+#: ../plugin/auth_all/auth_all.cc:96
+msgid "Allows all users to authenticate regardless of username or password"
+msgstr ""
+
 #: ../plugin/auth_file/auth_file.cc:205
 #, c-format
 msgid "Could not load auth file: %s\n"
@@ -3878,6 +3882,10 @@
 msgid "File to load for usernames and passwords"
 msgstr ""
 
+#: ../plugin/auth_file/auth_file.cc:232
+msgid "Authentication against a plain text file"
+msgstr ""
+
 #: ../plugin/auth_http/auth_http.cc:135
 msgid ""
 "auth_http plugin loaded but required option url not specified. Against which "
@@ -3888,6 +3896,10 @@
 msgid "URL for HTTP Auth check"
 msgstr ""
 
+#: ../plugin/auth_http/auth_http.cc:161
+msgid "Authenication against a web server using HTTP"
+msgstr ""
+
 #: ../plugin/auth_ldap/auth_ldap.cc:291
 #, c-format
 msgid "Reconnect failed: %s\n"
@@ -3931,6 +3943,14 @@
 msgid "How often to empty the users cache, 0 to disable"
 msgstr ""
 
+#: ../plugin/auth_ldap/auth_ldap.cc:460
+msgid "Authentication against an LDAP server"
+msgstr ""
+
+#: ../plugin/auth_pam/auth_pam.cc:146
+msgid "Authenication against system user accounts using PAM"
+msgstr ""
+
 #: ../plugin/auth_schema/auth_schema.cc:52
 msgid "auth_schema table cannot be an empty string"
 msgstr ""
@@ -3952,6 +3972,42 @@
 msgid "Database-qualified auth table name"
 msgstr ""
 
+#: ../plugin/auth_schema/module.cc:79
+msgid "Authentication against a table with encrypted passwords"
+msgstr ""
+
+#: ../plugin/auth_test/auth_test.cc:115
+msgid "Authentication module for testing"
+msgstr ""
+
+#: ../plugin/benchmark/benchmarkudf.cc:134
+msgid "BENCHMARK function"
+msgstr ""
+
+#: ../plugin/catalog/module.cc:44
+msgid "Catalog system and functions"
+msgstr ""
+
+#: ../plugin/charlength/charlength.cc:86
+msgid "CHAR_LENGTH and CHARACTER_LENGTH functions"
+msgstr ""
+
+#: ../plugin/coercibility_function/coercibility_function.cc:81
+msgid "COERCIBILITY function"
+msgstr ""
+
+#: ../plugin/collation_dictionary/dictionary.cc:46
+msgid "Character set and collation dictionaries"
+msgstr ""
+
+#: ../plugin/compression/compressionudf.cc:50
+msgid "COMPRESS and UNCOMPRESS functions"
+msgstr ""
+
+#: ../plugin/connection_id/connection_id.cc:86
+msgid "CONNECTION_ID function"
+msgstr ""
+
 #: ../plugin/console/console.cc:323
 #, c-format
 msgid "pipe() failed with errno %d"
@@ -3981,6 +4037,22 @@
 msgid "Default schema to use."
 msgstr ""
 
+#: ../plugin/console/console.cc:379
+msgid "Console client"
+msgstr ""
+
+#: ../plugin/crc32/crc32udf.cc:86
+msgid "CRC32 function"
+msgstr ""
+
+#: ../plugin/debug/module.cc:154
+msgid "Debug functions"
+msgstr ""
+
+#: ../plugin/default_replicator/default_replicator.cc:75
+msgid "Replicates all write events to all appliers"
+msgstr ""
+
 #: ../plugin/drizzle_protocol/drizzle_protocol.cc:88
 msgid ""
 "Port number to use for connection or 0 for default to with Drizzle/MySQL "
@@ -4023,8 +4095,16 @@
 msgid "Maximum simultaneous connections."
 msgstr ""
 
+#: ../plugin/drizzle_protocol/drizzle_protocol.cc:121
+msgid "Drizzle network protocol"
+msgstr ""
+
 #: ../plugin/errmsg_stderr/errmsg_stderr.cc:74
-msgid "Error Messages to stderr"
+msgid "Prints error messages to STDERR"
+msgstr ""
+
+#: ../plugin/error_dictionary/dictionary.cc:41
+msgid "Dictionary of Drizzle errors codes and messages"
 msgstr ""
 
 #: ../plugin/filtered_replicator/filtered_replicator.cc:545
@@ -4043,6 +4123,22 @@
 msgid "Regular expression to apply to tables to exclude"
 msgstr ""
 
+#: ../plugin/filtered_replicator/filtered_replicator.cc:565
+msgid "Replicates events filtered by schema or table name"
+msgstr ""
+
+#: ../plugin/function_dictionary/dictionary.cc:40
+msgid "Dictionary of functions"
+msgstr ""
+
+#: ../plugin/function_engine/function.cc:144
+msgid "Function engine"
+msgstr ""
+
+#: ../plugin/gearman_udf/gearman_udf.cc:60
+msgid "Gearman client"
+msgstr ""
+
 #: ../plugin/hello_events/hello_events.cc:402
 msgid "Enable Example Events Plugin"
 msgstr ""
@@ -4064,8 +4160,32 @@
 msgid "After drop database event observer call position"
 msgstr ""
 
+#. DRIZZLE_VERSION_ID
+#. module name
+#. module version
+#. author(s)
 #: ../plugin/hello_events/hello_events.cc:428
-msgid "An example events Plugin"
+msgid "Example EventObserver plugin"
+msgstr ""
+
+#. DRIZZLE_VERSION_ID
+#. module name
+#. module version
+#. author(s)
+#: ../plugin/hello_world/hello_world.cc:63
+msgid "Example Function plugin"
+msgstr ""
+
+#: ../plugin/hex_functions/hex_functions.cc:185
+msgid "HEX and UNHEX functions"
+msgstr ""
+
+#: ../plugin/http_functions/http_functions.cc:192
+msgid "HTTP_GET and HTTP_POST functions"
+msgstr ""
+
+#: ../plugin/information_schema_dictionary/dictionary.cc:100
+msgid "The INFORMATION_SCHEMA"
 msgstr ""
 
 #: ../plugin/innobase/handler/data_dictionary.cc:760
@@ -4073,53 +4193,55 @@
 msgid "Warning: data in %s truncated due to memory limit of %d bytes\n"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:1976
+#: ../plugin/innobase/handler/ha_innodb.cc:1978
 msgid ""
 "Once InnoDB is running, innodb_commit_concurrency must not change between "
 "zero and nonzero."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:2346
+#: ../plugin/innobase/handler/ha_innodb.cc:2348
 msgid ""
 "syntax error in innodb_log_group_home_dir, or a wrong number of mirrored log "
 "groups"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:2390
+#: ../plugin/innobase/handler/ha_innodb.cc:2392
 #, c-format
 msgid ""
 "InnoDB: invalid innodb_file_format_max value: should be any value up to %s "
 "or its equivalent numeric id"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9409
+#: ../plugin/innobase/handler/ha_innodb.cc:9414
 msgid "Do not use Native AIO library for IO, even if available"
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9450
+#: ../plugin/innobase/handler/ha_innodb.cc:9455
 msgid "Enable internal replication log."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9453
+#: ../plugin/innobase/handler/ha_innodb.cc:9458
+#: ../plugin/rabbitmq/rabbitmq_log.cc:179 ../plugin/zeromq/zeromq_log.cc:149
+msgid "Name of the replicator plugin to use (default='default_replicator')"
+msgstr ""
+
+#: ../plugin/innobase/handler/ha_innodb.cc:9461
 msgid ""
 "Timeout in seconds an InnoDB transaction may wait for a lock before being "
 "rolled back. Values above 100000000 disable the timeout."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9456
+#: ../plugin/innobase/handler/ha_innodb.cc:9464
 msgid "Percentage of the buffer pool to reserve for 'old' blocks."
 msgstr ""
 
-#: ../plugin/innobase/handler/ha_innodb.cc:9459
+#: ../plugin/innobase/handler/ha_innodb.cc:9467
 msgid ""
 "ove blocks to the 'new' end of the buffer pool if the first access was at "
 "least this many milliseconds ago. The timeout is disabled if 0 (the default)."
 msgstr ""
 
 #: ../plugin/innobase/handler/replication_dictionary.cc:125
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:167
-#: ../plugin/transaction_log/print_transaction_message.cc:173
-#: ../plugin/transaction_log/transaction_log_reader.cc:156
 #, c-format
 msgid "Unable to parse transaction. Got error: %s.\n"
 msgstr ""
@@ -4406,10 +4528,26 @@
 "Path to special datafile for doublewrite buffer. (default is : not used)"
 msgstr ""
 
+#: ../plugin/ipv6_function/ipv6_function.cc:99
+msgid "IPV6 function"
+msgstr ""
+
+#: ../plugin/js/js.cc:364
+msgid "Executes JavaScript code with supplied arguments"
+msgstr ""
+
 #: ../plugin/json_server/json_server.cc:359
 msgid "Port number to use for connection or 0 for default (port 8086) "
 msgstr ""
 
+#: ../plugin/json_server/json_server.cc:371
+msgid "JSON HTTP interface"
+msgstr ""
+
+#: ../plugin/length/length.cc:83
+msgid "LENGTH and OCTET_LENGTH functions"
+msgstr ""
+
 #: ../plugin/logging_gearman/logging_gearman.cc:186
 msgid "fail gearman_client_create()"
 msgstr ""
@@ -4428,7 +4566,7 @@
 msgstr ""
 
 #: ../plugin/logging_gearman/logging_gearman.cc:315
-msgid "Log queries to a Gearman server"
+msgid "Logs queries to a Gearman server"
 msgstr ""
 
 #: ../plugin/logging_query/logging_query.cc:180
@@ -4461,7 +4599,7 @@
 msgstr ""
 
 #: ../plugin/logging_query/logging_query.cc:347
-msgid "Log queries to a CSV file"
+msgid "Logs queries to a CSV file"
 msgstr ""
 
 #: ../plugin/logging_stats/logging_stats.cc:317
@@ -4481,13 +4619,25 @@
 msgstr ""
 
 #: ../plugin/logging_stats/logging_stats.cc:333
-msgid "User Statistics as DATA_DICTIONARY tables"
+msgid "Dictionaries for user statistics"
+msgstr ""
+
+#: ../plugin/math_functions/functions.cc:73
+msgid "Math functions (ABS, LOG, POW, LN, SQRT, CEIL, FLOOR, ORD, etc.)"
 msgstr ""
 
 #: ../plugin/md5/md5.cc:94
 msgid "libgcrypt library version mismatch"
 msgstr ""
 
+#: ../plugin/md5/md5.cc:113
+msgid "MD5 function"
+msgstr ""
+
+#: ../plugin/memcached_functions/memcached_functions.cc:356
+msgid "Memcached functions"
+msgstr ""
+
 #: ../plugin/memcached_stats/analysis_table.cc:78
 #: ../plugin/memcached_stats/stats_table.cc:144
 msgid "No value in MEMCACHED_STATS_SERVERS variable."
@@ -4498,7 +4648,7 @@
 msgstr ""
 
 #: ../plugin/memcached_stats/memcached_stats.cc:98
-msgid "Memcached Stats as I_S tables"
+msgid "Dictionary of memcached statistics"
 msgstr ""
 
 #: ../plugin/memcached_stats/stats_table.cc:74
@@ -4519,6 +4669,10 @@
 "memcached_servers_parse(%s)."
 msgstr ""
 
+#: ../plugin/memory/ha_heap.cc:849
+msgid "MEMORY storage engine"
+msgstr ""
+
 #: ../plugin/multi_thread/multi_thread.cc:64
 msgid "Session killed before thread could execute"
 msgstr ""
@@ -4531,6 +4685,10 @@
 msgid "Maximum number of user threads available."
 msgstr ""
 
+#: ../plugin/multi_thread/multi_thread.cc:212
+msgid "Multi-thread scheduler"
+msgstr ""
+
 #: ../plugin/myisam/ha_myisam.cc:525
 #, c-format
 msgid "Got an error from thread_id=%<PRIu64>, %s:%d"
@@ -4557,6 +4715,10 @@
 "when creating indexes with CREATE INDEX or ALTER TABLE."
 msgstr ""
 
+#: ../plugin/myisam/ha_myisam.cc:1517
+msgid "MyISAM storage engine: non-transactional, legacy, deprecated"
+msgstr ""
+
 #: ../plugin/myisam/my_handler_errors.cc:42
 msgid "Didn't find key on read or update"
 msgstr ""
@@ -4797,6 +4959,10 @@
 "Port number to use for connection or 0 for default to with MySQL protocol."
 msgstr ""
 
+#: ../plugin/mysql_protocol/mysql_protocol.cc:963
+msgid "MySQL network protocol"
+msgstr ""
+
 #: ../plugin/mysql_unix_socket_protocol/protocol.cc:78
 msgid ""
 " exists already. Do you have another Drizzle or MySQL running? Or perhaps "
@@ -4816,6 +4982,18 @@
 msgid "Clobber socket file if one is there already."
 msgstr ""
 
+#: ../plugin/mysql_unix_socket_protocol/protocol.cc:174
+msgid "MySQL Unix socket protocol"
+msgstr ""
+
+#: ../plugin/performance_dictionary/dictionary.cc:40
+msgid "Dictionary of session usage and performance"
+msgstr ""
+
+#: ../plugin/protocol_dictionary/dictionary.cc:89
+msgid "Dictionary of protocol counters"
+msgstr ""
+
 #: ../plugin/query_log/module.cc:83
 msgid "The query log file name must be defined."
 msgstr ""
@@ -4857,6 +5035,10 @@
 msgid "Threshold for logging queries that are active too long, in seconds"
 msgstr ""
 
+#: ../plugin/query_log/module.cc:293
+msgid "Logs queries to a file"
+msgstr ""
+
 #: ../plugin/rabbitmq/rabbitmq_handler.cc:115
 msgid "Could not open socket, is rabbitmq running?"
 msgstr ""
@@ -4880,101 +5062,174 @@
 msgid "Failed to allocate the RabbitMQHandler.  Got error: %s\n"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:141
+#: ../plugin/rabbitmq/rabbitmq_log.cc:140
 #, c-format
 msgid "Failed to allocate the RabbitMQLog instance.  Got error: %s\n"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:165
+#: ../plugin/rabbitmq/rabbitmq_log.cc:164
 msgid "Host name to connect to"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:168
+#: ../plugin/rabbitmq/rabbitmq_log.cc:167
 msgid "Port to connect to"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:171
+#: ../plugin/rabbitmq/rabbitmq_log.cc:170
 msgid "RabbitMQ virtualhost"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:174
+#: ../plugin/rabbitmq/rabbitmq_log.cc:173
 msgid "RabbitMQ username"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:177
+#: ../plugin/rabbitmq/rabbitmq_log.cc:176
 msgid "RabbitMQ password"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:180
-#: ../plugin/transaction_log/module.cc:239 ../plugin/zeromq/zeromq_log.cc:149
-msgid "Name of the replicator plugin to use (default='default_replicator')"
-msgstr ""
-
-#: ../plugin/rabbitmq/rabbitmq_log.cc:183
+#: ../plugin/rabbitmq/rabbitmq_log.cc:182
 msgid "Name of RabbitMQ exchange to publish to"
 msgstr ""
 
-#: ../plugin/rabbitmq/rabbitmq_log.cc:186
+#: ../plugin/rabbitmq/rabbitmq_log.cc:185
 msgid "Name of RabbitMQ routing key to use"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:48
+#: ../plugin/rabbitmq/rabbitmq_log.cc:196
+msgid "Publishes transactions to RabbitMQ"
+msgstr ""
+
+#: ../plugin/rand_function/rand_function.cc:135
+msgid "RAND function"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:54
+msgid "max-cache-buckets is too low, must be greater than 0"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:60
+msgid "max-lru-length is too low, must be greater than 0"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:66
 #, c-format
 msgid "Could not load regex policy file: %s\n"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:49
+#: ../plugin/regex_policy/module.cc:67
 msgid "Unknown"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:64
+#: ../plugin/regex_policy/module.cc:82
 msgid "File to load for regex authorization policies"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:220
+#: ../plugin/regex_policy/module.cc:85
+msgid "Maximum buckets for authorization cache"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:88
+msgid "Maximum number of LRU entries to track at once"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:241
 #, c-format
 msgid "User %s matches regex\n"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:223
+#: ../plugin/regex_policy/module.cc:244
 #, c-format
 msgid "Object %s matches regex %s (%s)\n"
 msgstr ""
 
-#: ../plugin/regex_policy/module.cc:229
+#: ../plugin/regex_policy/module.cc:250
 #, c-format
 msgid "Object %s NOT restricted by regex %s (%s)\n"
 msgstr ""
 
+#: ../plugin/regex_policy/module.cc:342
+#, c-format
+msgid ""
+"Unable to reduce size of cache below max buckets (current buckets=%<PRIu64>)"
+msgstr ""
+
+#: ../plugin/regex_policy/module.cc:366
+msgid "Authorization using a regex-matched policy file"
+msgstr ""
+
+#: ../plugin/registry_dictionary/dictionary.cc:46
+msgid "Dictionaries of modules and plugins"
+msgstr ""
+
+#: ../plugin/reverse_function/reverse_function.cc:106
+msgid "REVERSE function"
+msgstr ""
+
+#: ../plugin/schema_dictionary/dictionary.cc:45
+msgid "Dictionaries of schemas, tables, indexes, etc."
+msgstr ""
+
+#: ../plugin/schema_engine/plugin.cc:45
+msgid "Schema engine"
+msgstr ""
+
+#: ../plugin/session_dictionary/dictionary.cc:42
+msgid "Dictionaries of session variables and statements"
+msgstr ""
+
 #: ../plugin/session_dictionary/processlist.cc:73
 #: ../plugin/session_dictionary/sessions.cc:77
 msgid "no user"
 msgstr ""
 
-#: ../plugin/simple_user_policy/module.cc:46
+#: ../plugin/show_dictionary/plugin.cc:46
+msgid "Dictionary of SHOW commands"
+msgstr ""
+
+#: ../plugin/show_schema_proto/show_schema_proto.cc:111
+msgid "Shows text representation of schema definition proto"
+msgstr ""
+
+#: ../plugin/shutdown_function/shutdown.cc:85
+msgid "SHUTDOWN function"
+msgstr ""
+
+#: ../plugin/signal_handler/signal_handler.cc:262
+msgid "Signal handler"
+msgstr ""
+
+#: ../plugin/simple_user_policy/module.cc:47
 msgid ""
 "Remap '.' to another character/string when controlling access to a schema. "
 "Useful for usernames that have a '.' in them. If a '.' is remapped to an "
 "underscore, you don't have to quote the schema name."
 msgstr ""
 
+#: ../plugin/simple_user_policy/module.cc:58
+msgid "Authorization matching username to schema object name"
+msgstr ""
+
 #: ../plugin/slave/module.cc:56
 msgid "Path to the slave configuration file"
 msgstr ""
 
+#: ../plugin/slave/module.cc:67
+msgid "Drizzle replication slave"
+msgstr ""
+
 #: ../plugin/slave/queue_producer.cc:116
 msgid "Lost connection to master. Reconnecting."
 msgstr ""
 
 #: ../plugin/slave/queue_producer.cc:143 ../plugin/slave/queue_producer.cc:152
-#: ../plugin/slave/queue_producer.cc:166 ../plugin/slave/queue_producer.cc:258
-#: ../plugin/slave/queue_producer.cc:270 ../plugin/slave/queue_producer.cc:287
-#: ../plugin/slave/queue_producer.cc:430 ../plugin/slave/queue_producer.cc:444
+#: ../plugin/slave/queue_producer.cc:166 ../plugin/slave/queue_producer.cc:262
+#: ../plugin/slave/queue_producer.cc:274 ../plugin/slave/queue_producer.cc:291
+#: ../plugin/slave/queue_producer.cc:434 ../plugin/slave/queue_producer.cc:448
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../plugin/slave/queue_producer.cc:456
+#: ../plugin/slave/queue_producer.cc:460
 msgid "Replication slave: Unable to insert into queue."
 msgstr ""
 
@@ -4983,13 +5238,33 @@
 msgid "Could not start slave services: %s\n"
 msgstr ""
 
-#: ../plugin/slave/sql_executor.cc:91
+#: ../plugin/slave/sql_executor.cc:93
 #, c-format
 msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
 
+#: ../plugin/sleep/sleep.cc:133
+msgid "SLEEP function"
+msgstr ""
+
+#: ../plugin/status_dictionary/dictionary.cc:47
+msgid "Dictionaries of global and session variables"
+msgstr ""
+
+#: ../plugin/storage_engine_api_tester/storage_engine_api_tester.cc:718
+msgid "StorageEngine module for testing call order"
+msgstr ""
+
+#: ../plugin/string_functions/functions.cc:45
+msgid "String functions"
+msgstr ""
+
+#: ../plugin/substr_functions/substr_functions.cc:279
+msgid "SUBSTR and SUBSTR functions"
+msgstr ""
+
 #: ../plugin/syslog/errmsg.cc:40 ../plugin/syslog/logging.cc:56
 #, c-format
 msgid "syslog facility \"%s\" not known, using \"local0\""
@@ -5019,225 +5294,46 @@
 msgid "Syslog Priority of error messages"
 msgstr ""
 
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:106
-#: ../plugin/transaction_log/print_transaction_message.cc:106
-#: ../plugin/transaction_log/transaction_log_reader.cc:94
-msgid "Failed to open transaction log file"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:147
-#: ../plugin/transaction_log/transaction_log_reader.cc:147
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:153
-#, c-format
-msgid "Could not read transaction message.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:148
-#: ../plugin/transaction_log/transaction_log_reader.cc:148
-#, c-format
-msgid "GPB ERROR: %s.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:149
-#: ../plugin/transaction_log/transaction_log_reader.cc:149
-#, c-format
-msgid "Raw buffer read: %s.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/hexdump_transaction_message.cc:169
-#: ../plugin/transaction_log/print_transaction_message.cc:175
-#: ../plugin/transaction_log/transaction_log_reader.cc:158
-#, c-format
-msgid "BUFFER: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:169
-msgid "Failed to allocate the TransactionLog instance"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:177
-#, c-format
-msgid "Failed to initialize the Transaction Log.  Got error: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:188
-#, c-format
-msgid "Failed to initialize the Transaction Log Index.  Got error: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:227
-msgid "DEBUGGING - Truncate transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:230
-msgid "Enable CRC32 Checksumming of each written transaction log entry"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:233
-msgid "Enable transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:236
-msgid "Path to the file to use for transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:242
-msgid ""
-"0 == rely on operating system to sync log file (default), 1 == sync file at "
-"each transaction write, 2 == sync log file once per second"
-msgstr ""
-
-#: ../plugin/transaction_log/module.cc:245
-msgid "Number of slots for in-memory write buffers (default=8)."
-msgstr ""
-
-#: ../plugin/transaction_log/print_transaction_message.cc:134
-#, c-format
-msgid "GPB message is not a valid type.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/print_transaction_message.cc:154
-#, c-format
-msgid "GPB message is not a valid size.\n"
-msgstr ""
-
-#. 120 was arbitrary
-#: ../plugin/transaction_log/print_transaction_message.cc:167
-msgid "Could not read transaction message. Raw buffer read "
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log.cc:114
-msgid "Failed to open transaction log file "
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log.cc:215
-#, c-format
-msgid ""
-"Failed to write full size of log entry.  Tried to write %<PRId64> bytes at "
-"offset %<PRId64>, but only wrote %<PRId32> bytes.  Error: %s\n"
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log.cc:233
-msgid "Failed to sync log file."
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log_reader.cc:114
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:118
-#, c-format
-msgid "Attempted to read record bigger than INT_MAX\n"
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log_reader.cc:134
-#, c-format
-msgid "Memory allocation failure trying to allocate %<PRIu64> bytes.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/transaction_log_reader.cc:169
-#, c-format
-msgid "Checksum failed. Wanted %<PRIu32> got %<PRIu32>\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:65
-msgid "Cannot open file: "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:75
-msgid "Could not skip to position "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:112
-msgid "Found a non-transaction message in log. Currently, not supported.\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:138
-msgid "Memory allocation failure trying to allocate "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:140
-msgid " bytes\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:154
-msgid "GPB ERROR: "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:160
-msgid ""
-"HEXDUMP:\n"
-"\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:168
-msgid "Unable to parse command. Got error: "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_file_reader.cc:177
-msgid ""
-"\n"
-"HEXDUMP:\n"
-"\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:645
-msgid "Display help and exit"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:646
-msgid "Read from the innodb transaction log"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:652
-msgid "Password to use when connecting to server"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:655
-msgid "Perform checksum"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:656
-msgid "Ignore event messages"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:657
-msgid "Transaction log file"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:658
-msgid "Print raw Protobuf messages instead of SQL"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:661
-msgid "Start reading from the given file position"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:664
-msgid "Only output for the given transaction ID and later"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:667
-msgid "Only output for the given transaction ID"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:668
-msgid "Summarize message contents"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:702
-msgid "Cannot use --start-pos and --transaction-id together\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:708
-msgid "Cannot use --summarize with either --raw or --transaction-id\n"
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:826
-msgid "Checksum failed. Wanted "
-msgstr ""
-
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:828
-msgid " got "
+#: ../plugin/syslog/module.cc:130
+msgid "Logs error messages and queries to syslog"
+msgstr ""
+
+#: ../plugin/table_cache_dictionary/dictionary.cc:46
+msgid "Dictionaries of table cache and table definition cache"
+msgstr ""
+
+#: ../plugin/tableprototester/tableprototester.cc:365
+msgid "StorageEngine module for testing table proto messages"
+msgstr ""
+
+#: ../plugin/trigger_dictionary/module.cc:39
+msgid "Dictionary of triggers"
+msgstr ""
+
+#: ../plugin/user_locks/module.cc:58
+msgid "User-level locking and barrier functions"
+msgstr ""
+
+#: ../plugin/utility_dictionary/dictionary.cc:42
+msgid "Utility dictionaries"
+msgstr ""
+
+#: ../plugin/utility_functions/functions.cc:51
+msgid "Utility functions"
+msgstr ""
+
+#: ../plugin/uuid_function/uuid_function.cc:85
+msgid "UUID function using libuuid"
+msgstr ""
+
+#: ../plugin/version/versionudf.cc:69
+msgid "VERSION function"
 msgstr ""
 
 #: ../plugin/zeromq/zeromq_log.cc:146
 msgid "End point to bind to"
 msgstr ""
+
+#: ../plugin/zeromq/zeromq_log.cc:161
+msgid "Publishes transactions to ZeroMQ"
+msgstr ""

=== modified file 'po/ca.po'
--- po/ca.po	2012-02-15 14:37:56 +0000
+++ po/ca.po	2012-04-20 19:19:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: drizzle\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-15 20:06+0530\n"
+"POT-Creation-Date: 2012-03-23 19:48+0530\n"
 "PO-Revision-Date: 2010-08-10 16:31+0000\n"
 "Last-Translator: el_libre - http://www.catmidia.cat  "
 "XDDDDDDDDDDDDDDDDDDDDDDDDDDD <[e-mail]>\n"
@@ -340,7 +340,7 @@
 msgid "Ping the server to check if it's alive."
 msgstr ""
 
-#: ../client/drizzle.cc:1421 ../drizzled/drizzled.cc:1064
+#: ../client/drizzle.cc:1421 ../drizzled/drizzled.cc:1115
 msgid "Configuration file defaults are not used if no-defaults is set"
 msgstr ""
 
@@ -491,7 +491,6 @@
 msgstr ""
 
 #: ../client/drizzle.cc:1487 ../client/drizzledump.cc:548
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:648
 msgid "User for login if not current user."
 msgstr ""
 
@@ -1035,8 +1034,7 @@
 #: ../client/drizzledump.cc:506
 msgid ""
 "Give less verbose output (useful for debugging). Disables structure comments "
-"and header/footer constructs.  Enables options --skip-add-drop-table --no-"
-"set-names --skip-disable-keys"
+"and header/footer constructs.  Enables option --skip-disable-keys"
 msgstr ""
 
 #: ../client/drizzledump.cc:508
@@ -1131,12 +1129,10 @@
 msgstr ""
 
 #: ../client/drizzledump.cc:546
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:650
 msgid "Port number to use for connection."
 msgstr ""
 
 #: ../client/drizzledump.cc:550
-#: ../plugin/transaction_log/utilities/transaction_reader.cc:654
 msgid "The protocol of connection (mysql or drizzle)."
 msgstr ""
 
@@ -1277,414 +1273,414 @@
 msgid "Could not open '%s' for reading: errno = %d"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:356
+#: ../drizzled/drizzled.cc:359
 msgid "General Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:357
+#: ../drizzled/drizzled.cc:360
 msgid "Config File Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:358
+#: ../drizzled/drizzled.cc:361
 msgid "Kernel Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:359
+#: ../drizzled/drizzled.cc:362
 msgid "Plugin Loading Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:360
+#: ../drizzled/drizzled.cc:363
 msgid "Plugin Options"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:361
+#: ../drizzled/drizzled.cc:364
 msgid "Config and Plugin Loading"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:362
+#: ../drizzled/drizzled.cc:365
 msgid "Kernel and Plugin Loading and Plugin"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:476
+#: ../drizzled/drizzled.cc:509
 #, fuzzy
 msgid "Aborting:"
 msgstr "S'està interrompent\n"
 
-#: ../drizzled/drizzled.cc:534
+#: ../drizzled/drizzled.cc:571
 msgid "One can only use the --user switch if running as root"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:541
+#: ../drizzled/drizzled.cc:578
 msgid ""
 "drizzled cannot be run as root, use --user to start drizzled up as another "
 "user"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:584
+#: ../drizzled/drizzled.cc:628
 msgid "Set process group ID failed "
 msgstr ""
 
-#: ../drizzled/drizzled.cc:588
+#: ../drizzled/drizzled.cc:632
 msgid "Set process user ID failed"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:599
+#: ../drizzled/drizzled.cc:643
 msgid "Process chroot failed"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:698
+#: ../drizzled/drizzled.cc:742
 msgid "Invalid Value for auto_increment_increment"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:708
+#: ../drizzled/drizzled.cc:752
 msgid "Invalid Value for auto_increment_offset"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:718
+#: ../drizzled/drizzled.cc:762
 msgid "Invalid Value for completion_type"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:729
+#: ../drizzled/drizzled.cc:773
 msgid "Invalid Value for div-precision-increment"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:739
+#: ../drizzled/drizzled.cc:783
 msgid "Invalid Value for group_concat_max_len"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:749
+#: ../drizzled/drizzled.cc:793
 msgid "Invalid Value for join_buffer_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:760
+#: ../drizzled/drizzled.cc:804
 msgid "Invalid Value for max_allowed_packet"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:771
+#: ../drizzled/drizzled.cc:815
 msgid "Invalid Value for max_error_count"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:781
+#: ../drizzled/drizzled.cc:825
 msgid "Invalid Value for max_heap_table_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:792
+#: ../drizzled/drizzled.cc:836
 msgid "Invalid Value for min_examined_row_limit"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:802
+#: ../drizzled/drizzled.cc:846
 msgid "Invalid Value for max_join_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:812
+#: ../drizzled/drizzled.cc:856
 msgid "Invalid Value for max_length_for_sort_data"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:822
+#: ../drizzled/drizzled.cc:866
 msgid "Invalid Value for max_seeks_for_key"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:832
+#: ../drizzled/drizzled.cc:876
 msgid "Invalid Value for max_sort_length"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:842
+#: ../drizzled/drizzled.cc:886
 msgid "Invalid Value for optimizer_search_depth"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:852
+#: ../drizzled/drizzled.cc:896
 msgid "Invalid Value for preload_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:862
+#: ../drizzled/drizzled.cc:906
 msgid "Invalid Value for query_alloc_block_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:873
+#: ../drizzled/drizzled.cc:917
 msgid "Invalid Value for query_prealloc_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:884
+#: ../drizzled/drizzled.cc:928
 msgid "Invalid Value for range_alloc_block_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:895
+#: ../drizzled/drizzled.cc:939
 msgid "Invalid Value for read_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:906
+#: ../drizzled/drizzled.cc:950
 msgid "Invalid Value for read_rnd_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:916
+#: ../drizzled/drizzled.cc:960
 msgid "Invalid Value for sort_buff_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:926
+#: ../drizzled/drizzled.cc:970
 msgid "Invalid Value for table_def_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:936
+#: ../drizzled/drizzled.cc:980
 msgid "Invalid Value for table_cache_size"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:946 ../drizzled/drizzled.cc:961
+#: ../drizzled/drizzled.cc:990 ../drizzled/drizzled.cc:1005
 msgid "Invalid Value for table_lock_wait_timeout"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:971
+#: ../drizzled/drizzled.cc:1015
 msgid ""
 "Invalid Value for transaction_message_threshold valid values are between "
 "131072 - 1048576 bytes"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1039
+#: ../drizzled/drizzled.cc:1090
 #, c-format
 msgid "gethostname failed, using '%s' as hostname"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1053
+#: ../drizzled/drizzled.cc:1104
 #, fuzzy
 msgid "Display help and exit."
 msgstr "Mostra aquesta ajuda i surt."
 
-#: ../drizzled/drizzled.cc:1055
+#: ../drizzled/drizzled.cc:1106
 msgid "Run as a daemon."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1057 ../drizzled/drizzled.cc:1670
+#: ../drizzled/drizzled.cc:1108 ../drizzled/drizzled.cc:1724
 msgid "Run drizzled daemon as user."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1059
+#: ../drizzled/drizzled.cc:1110
 #, fuzzy
 msgid "Print version information and exit."
 msgstr "Mostra la informació de la versió i surt."
 
-#: ../drizzled/drizzled.cc:1066
+#: ../drizzled/drizzled.cc:1117
 msgid "Configuration file to use"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1068
+#: ../drizzled/drizzled.cc:1119
 msgid "Base location for config files"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1070 ../drizzled/drizzled.cc:1762
+#: ../drizzled/drizzled.cc:1121 ../drizzled/drizzled.cc:1816
 msgid "Directory for plugins."
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1075 ../drizzled/drizzled.cc:1766
+#: ../drizzled/drizzled.cc:1126 ../drizzled/drizzled.cc:1820
 msgid ""
 "Optional comma separated list of plugins to load at startup in addition to "
 "the default list of plugins. [for example: --plugin_add=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1079 ../drizzled/drizzled.cc:1772
+#: ../drizzled/drizzled.cc:1130 ../drizzled/drizzled.cc:1826
 msgid ""
 "Optional comma separated list of plugins to not load at startup. Effectively "
 "removes a plugin from the list of plugins to be loaded. [for example: --"
 "plugin_remove=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1083 ../drizzled/drizzled.cc:1778
+#: ../drizzled/drizzled.cc:1134 ../drizzled/drizzled.cc:1832
 msgid ""
 "Optional comma separated list of plugins to load at starup instead of the "
 "default plugin load list. [for example: --plugin_load=crc32,logger_gearman]"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1090 ../drizzled/drizzled.cc:1582
+#: ../drizzled/drizzled.cc:1141 ../drizzled/drizzled.cc:1636
 msgid "Auto-increment columns are incremented by this"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1092 ../drizzled/drizzled.cc:1587
+#: ../drizzled/drizzled.cc:1143 ../drizzled/drizzled.cc:1641
 msgid ""
 "Offset added to Auto-increment columns. Used when auto-increment-increment !"
 "= 1"
 msgstr ""
 
-#: ../drizzled/drizzled.cc:1094 ../drizzled/drizzled.cc:1593
+#: ../drizzled/drizzled.cc:1145 ../drizzled/drizzled.cc:1647
 msgid ""
 "Path to installation directory. All paths are usually resolved relative to "
 "this."
 msgstr ""