Merge lp:~hingo/drizzle/drizzle-7.1.x-versioning-plus-all-fixes into lp:~drizzle-trunk/drizzle/development

[Henrik Ingo]

Combines
https://code.launchpad.net/~hingo/drizzle/drizzle-drizzledump-and-other-version-fixes/+merge/91598
and
https://code.launchpad.net/~hingo/drizzle/drizzle-the-version-is-7.1-not-a-date-and-certainly-not-7/+merge/90809

To recap:

To pass all tests, you must do bzr tag 7.1.31-rc first
If you don't, then main.comments will fail, this is correct behavior. Everything else should pass either way.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-05 04:23:43 +0000
+++ .bzrignore	2012-02-08 23:35:14 +0000
@@ -224,6 +224,7 @@
 plugin/transaction_log/utilities/drizzletrx
 po/POTFILES
 po/drizzle7.pot
+po/drizzle.pot
 po/remove-potcdate.sed
 po/stamp-it
 po/stamp-po
@@ -303,6 +304,7 @@
 support-files/Makefile.in
 support-files/drizzle-log-rotate
 support-files/drizzle7.pc
+support-files/drizzle.pc
 support-files/drizzle.server
 support-files/drizzle.spec
 support-files/libdrizzle.pc
 
=== removed file '.bzrignore.THIS'
--- .bzrignore.THIS	2011-12-30 22:59:59 +0000
+++ .bzrignore.THIS	1970-01-01 00:00:00 +0000
@@ -1,389 +0,0 @@
-*.bb
-*.bbg
-*.da
-*.dirstamp
-*.gcda
-*.gcno
-*.gmo
-*.gz
-*.la
-*.linted
-*.lo
-*.orig
-*.rej
-*.reject
-*.rpm
-*replication.pb.*
-*stamp-h
-./ChangeLog
-.DS_Store
-.deps
-.libs
-.plugin.ini.stamp
-.plugin.scan
-ChangeLog
-DEPENDENCIES
-INSTALL
-Makefile
-Makefile.in
-TAGS
-aclocal.m4
-authentication.gcno
-autom4te.cache/
-cached_item.gcno
-calendar.gcno
-check_stack_overrun.gcno
-client/Makefile.in
-client/drizzle
-client/drizzleadmin
-client/drizzlebinlog
-client/drizzlecheck
-client/drizzledump
-client/drizzleimport
-client/drizzleslap
-client/drizzletest
-client/mysqlslap
-comp_creator.gcno
-compile
-config.guess
-config.h
-config.h.gch
-config.h.in
-config.log
-config.status
-config.sub
-config/bzr_revinfo
-config/pandora-plugin.list
-config/pandora_vc_revinfo
-config/plugin-list.ac
-config/plugin-list.am
-config/plugin.ac
-config/plugin.am
-config/plugin.list
-config/plugin.stamp
-config/top.h
-configure
-configvar.gcno
-current_session.gcno
-dbug/Makefile.in
-depcomp
-docs
-docs/doctrees
-docs/html
-docs/plugins/*
-docs/plugins/list.rst
-doxerr.log
-drizzle-2010.01.1315.tar.gz
-drizzle.pot
-drizzled.gcno
-drizzled/configmake.h
-drizzled/drizzled
-drizzled/drizzled_safe
-drizzled/function_hash.h
-drizzled/gen_lex_hash
-drizzled/generated_probes.h
-drizzled/lex_hash.h
-drizzled/message/alter_table.pb.cc
-drizzled/message/alter_table.pb.h
-drizzled/message/binary_log.pb.cc
-drizzled/message/binary_log.pb.h
-drizzled/message/binlog_reader
-drizzled/message/binlog_writer
-drizzled/message/command_reader
-drizzled/message/engine.pb.cc
-drizzled/message/engine.pb.h
-drizzled/message/event.pb.cc
-drizzled/message/event.pb.h
-drizzled/message/length
-drizzled/message/replication.pb.cc
-drizzled/message/replication.pb.h
-drizzled/message/replication_event.pb.cc
-drizzled/message/replication_event.pb.h
-drizzled/message/replication_event_reader
-drizzled/message/replication_event_writer
-drizzled/message/resultset.pb.cc
-drizzled/message/resultset.pb.h
-drizzled/message/schema.pb.cc
-drizzled/message/schema.pb.h
-drizzled/message/schema_reader
-drizzled/message/schema_writer
-drizzled/message/table.pb.cc
-drizzled/message/table.pb.h
-drizzled/message/table_raw_reader
-drizzled/message/table_reader
-drizzled/message/table_writer
-drizzled/message/transaction.pb.cc
-drizzled/message/transaction.pb.h
-drizzled/message/transaction_writer
-drizzled/module/load_list.h
-drizzled/plugin/version.h
-drizzled/schema.pb.cc
-drizzled/schema.pb.h
-drizzled/sql_builtin.cc
-drizzled/sql_yacc.cc
-drizzled/sql_yacc.hh
-drizzled/sql_yacc.output
-drizzled/sql_reserved_words.h
-drizzled/symbol_hash.h
-drizzled/version.h
-dtcollation.gcno
-errmsg.gcno
-errmsg_print.gcno
-error.gcno
-examples/client
-examples/pipe_query
-examples/proxy
-examples/server
-examples/simple
-examples/simple_multi
-examples/sqlite_server
-extra/Makefile.in
-extra/comp_err
-extra/innochecksum
-extra/my_print_defaults
-extra/mysql_waitpid
-field.gcno
-field_conv.gcno
-field_iterator.gcno
-filesort.gcno
-gnulib/getopt.h
-gnulib/time.h
-gnulib/unistd.h
-ha_trx_info.gcno
-handler.gcno
-handlerton.gcno
-hybrid_type_traits.gcno
-hybrid_type_traits_decimal.gcno
-hybrid_type_traits_integer.gcno
-include/Makefile.in
-include/config.h
-include/drizzle_version.h
-include/mysqld_ername.h
-include/mysqld_error.h
-include/sql_state.h
-include/stamp-h1
-install-sh
-item.gcno
-key.gcno
-key_map.gcno
-libdrizzle-2.0/libdrizzle/mysql_password_hash
-libdrizzle-2.0/libdrizzle/drizzle_password_hash
-libmysql/Makefile.in
-libserialutil_la-db.gcno
-libserialutil_la-unireg.gcno
-libtool
-lint-rules.am
-lock.gcno
-log.gcno
-logging.gcno
-ltmain.sh
-m4/bzr_version.m4
-m4/libtool.m4
-m4/ltoptions.m4
-m4/ltsugar.m4
-m4/ltversion.m4
-m4/lt~obsolete.m4
-mf_iocache.gcno
-missing
-my_decimal.gcno
-mysql-test/Makefile.in
-mysys/Makefile.in
-mysys/tests/Makefile.in
-name_resolution_context_state.gcno
-natural_join_column.gcno
-opt_range.gcno
-opt_sum.gcno
-out
-pandora-plugin.ac
-pandora-plugin.am
-parser.gcno
-patch
-plugin/Makefile.in
-plugin/archive/Makefile.in
-plugin/archive/archive_performance
-plugin/archive/archive_reader
-plugin/archive/archive_test
-plugin/archive/concurrency_test
-plugin/blackhole/Makefile.in
-plugin/csv/Makefile.in
-plugin/heap/Makefile.in
-plugin/innobase/Makefile.in
-plugin/innobase/include/pars0grm.hh
-plugin/innobase/include/pars0grm.h
-plugin/innobase/pars/pars0grm.c
-plugin/innobase/pars/pars0grm.cc
-plugin/innobase/pars/pars0grm.h
-plugin/innobase/pars/pars0lex.c
-plugin/memcached_functions/start_mc.sh
-plugin/memcached_functions/tests/start_mc.sh
-plugin/myisam/Makefile.in
-plugin/myisam/myisamchk
-plugin/myisam/myisamlog
-plugin/myisam/myisampack
-plugin/storage_engine_api_tester/cursor_states_to_dot
-plugin/storage_engine_api_tester/engine_states_to_dot
-plugin/transaction_log/utilities/drizzletrx
-po/POTFILES
-po/drizzle7.pot
-po/remove-potcdate.sed
-po/stamp-it
-po/stamp-po
-protocol.gcno
-qcache.gcno
-query_id.gcno
-records.gcno
-regex/Makefile.in
-rename.gcno
-replicator.gcno
-scheduling.gcno
-scripts/Makefile.in
-server/drizzled_safe
-server/gen_lex_hash
-server/lex_hash.h
-server/share/czech/
-server/share/danish/
-server/share/dutch/
-server/share/english/
-server/share/estonian/
-server/share/french/
-server/share/german/
-server/share/greek/
-server/share/hungarian/
-server/share/italian/
-server/share/japanese-sjis/
-server/share/japanese/
-server/share/korean/
-server/share/norwegian-ny/
-server/share/norwegian/
-server/share/polish/
-server/share/portuguese/
-server/share/romanian/
-server/share/russian/
-server/share/serbian/
-server/share/slovak/
-server/share/spanish/
-server/share/swedish/
-server/share/ukrainian/
-server/sql_yacc.cc
-server/sql_yacc.h
-server/sql_yacc.output
-session.gcno
-set_var.gcno
-show.gcno
-sj_tmp_table.gcno
-sql-common/Makefile.in
-sql/Makefile.in
-sql/share/Makefile.in
-sql_base.gcno
-sql_client.gcno
-sql_connect.gcno
-sql_delete.gcno
-sql_derived.gcno
-sql_error.gcno
-sql_handler.gcno
-sql_insert.gcno
-sql_lex.gcno
-sql_list.gcno
-sql_load.gcno
-sql_locale.gcno
-sql_parse.gcno
-sql_plugin.gcno
-sql_select.gcno
-sql_state.gcno
-sql_string.gcno
-sql_table.gcno
-sql_udf.gcno
-sql_union.gcno
-sql_update.gcno
-sql_yacc.gcno
-stacktrace.gcno
-stamp-h1
-strfunc.gcno
-strings/Makefile.in
-strings/tests/Makefile.in
-support-files/Makefile.in
-support-files/drizzle-log-rotate
-support-files/drizzle7.pc
-support-files/drizzle.server
-support-files/drizzle.spec
-support-files/libdrizzle.pc
-support-files/libdrizzle-1.0.pc
-support-files/libdrizzle-2.0.pc
-support-files/libdrizzleclient.pc
-support-files/smf/Makefile.in
-support-files/smf/drizzle
-support-files/smf/drizzle.xml
-support-files/smf/install.sh
-table.gcno
-table_map_iterator.gcno
-temporal.gcno
-temporal_format.gcno
-tests/Makefile.in
-tests/dtr
-tests/dtr@
-tests/dbqp
-tests/dbqp_data/uuid
-tests/dbqp_work
-tests/install_test_db
-tests/mtr
-tests/mtr@
-tests/resolve_stack_dump
-tests/stripped_log
-tests/test-run
-tests/test-run@
-tests/total_warning_count
-tests/var
-tests/workdir
-thr_malloc.gcno
-time.gcno
-tmp_table.gcno
-tztime.gcno
-uniques.gcno
-unittests/atomics_test
-unittests/calendar_test
-unittests/unittests
-unittests/uwagi.txt
-virtual_column_info.gcno
-xid.gcno
-ylwrap
-docs/html
-docs/dirhtml
-docs/singlehtml
-docs/pickle
-docs/json
-docs/htmlhelp
-docs/qthelp
-docs/devhelp
-docs/epub
-docs/latex
-docs/latexpdf
-docs/text
-docs/man
-docs/changes
-docs/linkcheck
-docs/doctest
-.pc
-drizzled/message/catalog.pb.cc
-drizzled/message/catalog.pb.h
-drizzled/message/catalog_reader
-drizzled/message/catalog_writer
-drizzled/message/replication_options.pb.cc
-drizzled/message/replication_options.pb.h
-drizzled/message/access.pb.cc
-drizzled/message/access.pb.h
-drizzled/execute/parser.cc
-drizzled/execute/parser.h
-drizzled/execute/parser.output
-drizzled/execute/scanner.cc
-drizzled/execute/scanner.h
-plugin/innobase/xtrabackup/drizzlebackup.innobase
-libdrizzle-2.0/drizzle_password_hash
-libdrizzle-2.0/mysql_password_hash
-tags
-libdrizzle-1.0/t/c_test
-libdrizzle-1.0/t/client_server
-libdrizzle-1.0/t/drizzle_column_st
-libdrizzle-1.0/t/drizzle_con_st
-libdrizzle-1.0/t/drizzle_query_st
-libdrizzle-1.0/t/drizzle_result_st
-libdrizzle-1.0/t/drizzle_st
 
=== modified file 'Makefile.am'
--- Makefile.am	2012-02-05 04:23:43 +0000
+++ Makefile.am	2012-02-08 23:35:14 +0000
@@ -197,24 +197,10 @@
 	find ./ | $(GREP) \~$$ | xargs rm -f
 	bzr unknowns
 
-install-exec-hook:
-	cd $(DESTDIR)$(sbindir) && \
-	mv -f drizzled$(EXEEXT) drizzled7$(EXEEXT) && \
-	$(LN_S) drizzled7$(EXEEXT) drizzled$(EXEEXT)
-
-install-data-hook:
-	cd $(DESTDIR)$(man8dir) && \
-	mv -f drizzled.8 drizzled7.8 && \
-	$(LN_S) drizzled7.8 drizzled.8
-
-uninstall-hook:
-	rm $(DESTDIR)$(man8dir)/drizzled7.8
-	rm $(DESTDIR)$(sbindir)/drizzled7$(EXEEXT)
-
 rpm-build: support-files/drizzle.spec
 	@rm -f ~/rpmbuild/RPMS/x86_64/drizzle-$(VERSION)*.rpm
 	@rm -f ~/rpmbuild/SRPMS/drizzle-$(VERSION)*.rpm
-	@cp drizzle7-$(VERSION).tar.gz ~/rpmbuild/SOURCES/
+	@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 .
 
=== modified file 'client/drizzle.cc'
--- client/drizzle.cc	2012-02-05 04:23:43 +0000
+++ client/drizzle.cc	2012-02-08 23:35:14 +0000
@@ -1374,8 +1374,8 @@
 # if defined(HAVE_LOCALE_H)
   setlocale(LC_ALL, "");
 # endif
-  bindtextdomain("drizzle7", LOCALEDIR);
-  textdomain("drizzle7");
+  bindtextdomain("drizzle", LOCALEDIR);
+  textdomain("drizzle");
 #endif
 
   po::options_description commandline_options(_("Options used only in command line"));
 
=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2012-02-05 04:23:43 +0000
+++ client/drizzledump.cc	2012-02-08 23:35:14 +0000
@@ -465,8 +465,8 @@
 # if defined(HAVE_LOCALE_H)
   setlocale(LC_ALL, "");
 # endif
-  bindtextdomain("drizzle7", LOCALEDIR);
-  textdomain("drizzle7");
+  bindtextdomain("drizzle", LOCALEDIR);
+  textdomain("drizzle");
 #endif
 
   po::options_description commandline_options(_("Options used only in command line"));
 
=== modified file 'client/server_detect.cc'
--- client/server_detect.cc	2011-08-07 20:48:33 +0000
+++ client/server_detect.cc	2012-02-08 23:35:14 +0000
@@ -30,12 +30,22 @@
 {
   boost::match_flag_type flags = boost::match_default;
 
-  boost::regex mysql_regex("^([3-9]\\.[0-9]+\\.[0-9]+)");
-  boost::regex drizzle_regex("^(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
+  // FIXME: Detecting capabilities from a version number is a recipe for
+  // disaster, like we've seen with 15 years of JavaScript :-)
+  // Anyway, as there is no MySQL 7.x yet, this will do for tonight.
+  // I will get back to detect something tangible after the release (like
+  // presence of some table or its record in DATA_DICTIONARY.
+  boost::regex mysql_regex("^([3-6]\\.[0-9]+\\.[0-9]+)");
+  boost::regex drizzle_regex7("^(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
+  boost::regex drizzle_regex71("^([7-9]\\.[0-9]+\\.[0-9]+)");
 
   version= drizzle_con_server_version(connection);
 
-  if (regex_search(version, drizzle_regex, flags))
+  if (regex_search(version, drizzle_regex7, flags))
+  {
+    type= SERVER_DRIZZLE_FOUND;
+  }
+  else if (regex_search(version, drizzle_regex71, flags))
   {
     type= SERVER_DRIZZLE_FOUND;
   }
 
=== modified file 'configure.ac'
--- configure.ac	2012-02-05 04:23:43 +0000
+++ configure.ac	2012-02-08 23:35:14 +0000
@@ -20,7 +20,7 @@
 AC_PREREQ(2.59)dnl		Minimum Autoconf version required.
 dnl Version from the AC_INIT call below is overridden later
 dnl So don't update it here
-AC_INIT([drizzle7],[7],[http://bugs.launchpad.net/drizzle],[drizzle7],[http://drizzle.org/])
+AC_INIT([drizzle],[7.1],[http://bugs.launchpad.net/drizzle],[drizzle],[http://drizzle.org/])
 AC_CONFIG_SRCDIR([drizzled/drizzled.cc])
 AC_CONFIG_AUX_DIR([config])
 
@@ -170,7 +170,7 @@
  tests/Makefile dnl
  drizzled/plugin/version.h dnl
  support-files/drizzle.spec dnl
- support-files/drizzle7.pc dnl
+ support-files/drizzle.pc dnl
  support-files/libdrizzle.pc dnl
  support-files/libdrizzle-1.0.pc dnl
  support-files/smf/install.sh dnl
 
=== modified file 'docs/installing/redhat.rst'
--- docs/installing/redhat.rst	2012-02-05 04:23:43 +0000
+++ docs/installing/redhat.rst	2012-02-08 23:35:14 +0000
@@ -71,5 +71,7 @@
 
 .. code-block:: bash
 
-   sudo yum install drizzle7-server drizzle7-client
+   sudo yum install drizzle-server drizzle-client
+
+Note: On older versions of Fedora and RHEL, the packages are named drizzle7-server and drizzle7-client.
 
 
=== modified file 'drizzled/main.cc'
--- drizzled/main.cc	2012-02-05 04:23:43 +0000
+++ drizzled/main.cc	2012-02-08 23:35:14 +0000
@@ -237,8 +237,8 @@
 # if defined(HAVE_LOCALE_H)
   setlocale(LC_ALL, "");
 # endif
-  bindtextdomain("drizzle7", LOCALEDIR);
-  textdomain("drizzle7");
+  bindtextdomain("drizzle", LOCALEDIR);
+  textdomain("drizzle");
 #endif
 
   module::Registry &modules= module::Registry::singleton();
 
=== modified file 'drizzled/sys_var.cc'
--- drizzled/sys_var.cc	2012-02-05 04:23:43 +0000
+++ drizzled/sys_var.cc	2012-02-08 23:35:14 +0000
@@ -94,8 +94,8 @@
 
 namespace
 {
-  static size_t revno= DRIZZLE7_VC_REVNO;
-  static size_t release_id= DRIZZLE7_RELEASE_ID;
+  static size_t revno= DRIZZLE_VC_REVNO;
+  static size_t release_id= DRIZZLE_RELEASE_ID;
 }
 
 const char *bool_type_names[]= { "OFF", "ON", NULL };
@@ -245,8 +245,8 @@
 /* Global read-only variable containing hostname */
 static sys_var_const_string sys_hostname("hostname", getServerHostname());
 
-static sys_var_const_str sys_revid("vc_revid", DRIZZLE7_VC_REVID);
-static sys_var_const_str sys_branch("vc_branch", DRIZZLE7_VC_BRANCH);
+static sys_var_const_str sys_revid("vc_revid", DRIZZLE_VC_REVID);
+static sys_var_const_str sys_branch("vc_branch", DRIZZLE_VC_BRANCH);
 static sys_var_size_t_ptr_readonly sys_revno("vc_revno", &revno);
 static sys_var_size_t_ptr_readonly sys_release_id("vc_release_id", &release_id);
 
 
=== modified file 'm4/pandora_vc_build.m4'
--- m4/pandora_vc_build.m4	2012-02-05 04:23:43 +0000
+++ m4/pandora_vc_build.m4	2012-02-08 23:35:14 +0000
@@ -60,7 +60,15 @@
         PANDORA_VC_REVNO="${PANDORA_BZR_REVNO}"
         PANDORA_VC_REVID=`bzr log -r-1 --show-ids | grep revision-id | cut -f2 -d' ' | head -1`
         PANDORA_VC_BRANCH=`bzr nick`
+        # Check if this branch has just been tagged (not yet committed)
         PANDORA_VC_TAG=`bzr tags -r-1 | cut -f1 -d' ' | head -1`
+        # If not, then check if we have checked out a branch where most recent commit
+        # was tagged, and there are no further (uncommitted) changes in the branch.
+        if test "x${PANDORA_VC_TAG}" = "x"; then
+            if test `bzr diff | wc -l` = 0; then
+                PANDORA_VC_TAG=`bzr tags -r-2 | cut -f1 -d' ' | head -1`
+            fi
+        fi
         PANDORA_VC_LATEST_TAG=`bzr tags --sort=time | grep -v '\?'| cut -f1 -d' '  | tail -1`
         if test "x${vc_changelog}" = "xyes"; then
           bzr log --gnu > ChangeLog
@@ -128,14 +136,26 @@
     
   AS_IF([test "x${PANDORA_VC_TAG}" != "x"],[
     PANDORA_RELEASE_VERSION="${PANDORA_VC_TAG}"
+    # 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//'`
+    # 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:
+    #  1) Make sure minor version has at least 2 digits (2 -> 02)
+    #  2) Make sure build version has at least 2 digits (3 -> 03)
+    #  3) Remove dots (1.02.03 -> 10203)
     changequote(<<, >>)dnl
-    PANDORA_RELEASE_ID=`echo ${PANDORA_RELEASE_VERSION} | sed 's/[^0-9]//g'`
+    PANDORA_RELEASE_ID=`echo ${PANDORA_VC_TAG_JUST_NUMBERS} | sed -e 's/\.\([0-9]\)\./.0\1./' | sed -e 's/\.\([0-9]\)$/.0\1/' | sed 's/[^0-9]//g'`
     changequote([, ])dnl
   ],[
     AS_IF([test "x${PANDORA_VC_LATEST_TAG}" != "x"],[
-      PANDORA_RELEASE_VERSION="${PANDORA_VC_LATEST_TAG}.${PANDORA_VC_REVNO}"
+      # We now support release tags to append a descriptive tag -stable, -rc, -beta, -alpha, -milestone.
+      # 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"
       changequote(<<, >>)dnl
-      PANDORA_RELEASE_ID=`echo ${PANDORA_VC_LATEST_TAG} | sed 's/[^0-9]//g'`
+      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}"
 
=== modified file 'plugin/auth_ldap/docs/index.rst'
--- plugin/auth_ldap/docs/index.rst	2012-02-05 04:23:43 +0000
+++ plugin/auth_ldap/docs/index.rst	2012-02-08 23:35:14 +0000
@@ -418,12 +418,12 @@
 
 You could just setup Drizzle to authenticate against standard LDAP accounts like
 John Doe above. But the recommended way is to add a specific Drizzle schema.
-You will find this in ``$DRIZZLE_ROOT/share/drizzle7/drizzle_openldap.ldif``.
+You will find this in ``$DRIZZLE_ROOT/share/drizzle/drizzle_openldap.ldif``.
 You can add it to your LDAP schema like this:
 
 .. code-block:: none
     
-    $ sudo ldapadd -Y EXTERNAL -H ldapi:/// -f share/drizzle7/drizzle_openldap.ldif 
+    $ sudo ldapadd -Y EXTERNAL -H ldapi:/// -f share/drizzle/drizzle_openldap.ldif 
     SASL/EXTERNAL authentication started
     SASL username: gidNumber=0+uidNumber=0,cn=peercred,cn=external,cn=auth
     SASL SSF: 0
@@ -464,7 +464,7 @@
 
 .. code-block:: none
     
-    $ share/drizzle7/drizzle_create_ldap_user -p secret -b bin/drizzle_password_hash -u hingo -n 1 -l "ou=people,dc=example,dc=com" > hingo.example.com.ldif
+    $ share/drizzle/drizzle_create_ldap_user -p secret -b bin/drizzle_password_hash -u hingo -n 1 -l "ou=people,dc=example,dc=com" > hingo.example.com.ldif
     $ cat hingo.example.com.ldif 
     dn: uid=hingo,ou=people,dc=example,dc=com                                                                                                                                           
     objectclass: top                                                                                                                                                                    
 
=== modified file 'plugin/innobase/xtrabackup/xtrabackup.cc'
--- plugin/innobase/xtrabackup/xtrabackup.cc	2012-02-05 04:23:43 +0000
+++ plugin/innobase/xtrabackup/xtrabackup.cc	2012-02-08 23:35:14 +0000
@@ -634,7 +634,7 @@
 static void print_version(void)
 {
   printf("%s  Ver %s Rev %s for %s %s (%s)\n" ,my_progname,
-	  XTRABACKUP_VERSION, XTRABACKUP_REVISION, "Drizzle7",
+	  XTRABACKUP_VERSION, XTRABACKUP_REVISION, "Drizzle",
          TARGET_OS, TARGET_CPU);
 }
 
 
=== renamed file 'support-files/drizzle7.pc.in' => 'support-files/drizzle.pc.in'
--- support-files/drizzle7.pc.in	2012-02-08 06:30:51 +0000
+++ support-files/drizzle.pc.in	2012-02-08 23:35:14 +0000
@@ -3,7 +3,7 @@
 libdir=@libdir@
 pkgincludedir=@pkgincludedir@
 
-Name: drizzle7
+Name: drizzle
 Description: Drizzle CLI
 Version: @VERSION@
 URL: http://drizzle.org/
 
=== modified file 'support-files/include.am'
--- support-files/include.am	2012-02-05 04:23:43 +0000
+++ support-files/include.am	2012-02-08 23:35:14 +0000
@@ -27,6 +27,6 @@
 
 pkgconfigdir= $(libdir)/pkgconfig
 pkgconfig_DATA= \
-		support-files/drizzle7.pc \
+		support-files/drizzle.pc \
 		support-files/libdrizzle.pc \
 		support-files/libdrizzle-1.0.pc
 
=== modified file 'tests/r/comments.result'
--- tests/r/comments.result	2011-03-06 23:59:06 +0000
+++ tests/r/comments.result	2012-02-08 23:35:14 +0000
@@ -11,8 +11,8 @@
 1  +1
 2
 select 1 /*!72301 +1 */;
-1  +1
-2
+1
+1
 select 1--1;
 1--1
 2
 
=== modified file 'tests/valgrind.supp'
--- tests/valgrind.supp	2012-02-05 04:23:43 +0000
+++ tests/valgrind.supp	2012-02-08 23:35:14 +0000
@@ -555,7 +555,7 @@
    Memcheck:Leak
    fun:_Znwm
    fun:_ZN5boost6detail12set_tss_dataEPKvNS_10shared_ptrINS0_20tss_cleanup_functionEEEPvb
-   fun:_ZN8drizzled7Session12storeGlobalsEv
+   fun:_ZN8drizzledSession12storeGlobalsEv
    fun:_ZN8drizzled21drizzle_rm_tmp_tablesEv
    fun:main
 }
@@ -564,7 +564,7 @@
    Memcheck:Leak
    fun:_Znwj
    fun:_ZN5boost6detail12set_tss_dataEPKvNS_10shared_ptrINS0_20tss_cleanup_functionEEEPvb
-   fun:_ZN8drizzled7Session12storeGlobalsEv
+   fun:_ZN8drizzledSession12storeGlobalsEv
    fun:_ZN8drizzled21drizzle_rm_tmp_tablesEv
    fun:main
 }
 
=== modified file 'win32/config.h'
--- win32/config.h	2012-02-05 04:23:43 +0000
+++ win32/config.h	2012-02-08 23:35:14 +0000
@@ -34,6 +34,6 @@
 
 #pragma once
 
-#define PACKAGE_VERSION "drizzle7"
+#define PACKAGE_VERSION "drizzle"
 #define PACKAGE_BUGREPORT "http://bugs.launchpad.net/drizzle"