lp:~brianaker/drizzle/986455

Created by Brian Aker and last modified
Get this branch:
bzr branch lp:~brianaker/drizzle/986455
Only Brian Aker can upload to this branch. If you are Brian Aker please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Brian Aker
Project:
Drizzle
Status:
Merged

Recent revisions

2545. By Brian Aker

Fix for lp:986455

2544. By Brian Aker

Ignore generated version file.

2543. By Brian Aker

Fix return error for one particular type of disconnect.

2542. By Brian Aker

Clean up error messages on libdrizzle

2541. By Drizzle Continuous Integration

modified:
  plugin/slave/queue_producer.cc
pending merge tips: (use -v to see all merge revisions)
  Stewart Smith 2012-04-14 improve messages from slave io thread to better indicate what is going on at any one time.

2540. By Drizzle Continuous Integration

modified:
  libdrizzle/conn.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-16 If you try to connect while Drizzle is starting up, the connection will bever happen.

2539. By Drizzle Continuous Integration

Merge and fix configure.ac conflict.

2538. By Drizzle Continuous Integration

removed:
  support-files/drizzle.spec.in
  support-files/drizzled.init
added:
  support-files/README
  support-files/deb/
  support-files/deb/debian/
  support-files/deb/debian/changelog
  support-files/deb/debian/compat
  support-files/deb/debian/conf.d/
  support-files/deb/debian/conf.d/auth-file.cnf
  support-files/deb/debian/conf.d/auth-http.cnf
  support-files/deb/debian/conf.d/auth-ldap.cnf
  support-files/deb/debian/conf.d/auth-pam.cnf
  support-files/deb/debian/conf.d/auth-schema.cnf
  support-files/deb/debian/conf.d/debug.cnf
  support-files/deb/debian/conf.d/filtered-replicator.cnf
  support-files/deb/debian/conf.d/gearman-udf.cnf
  support-files/deb/debian/conf.d/http-functions.cnf
  support-files/deb/debian/conf.d/json-server.cnf
  support-files/deb/debian/conf.d/logging-gearman.cnf
  support-files/deb/debian/conf.d/logging-query.cnf
  support-files/deb/debian/conf.d/mysql-protocol.cnf
  support-files/deb/debian/conf.d/mysql-unix-socket-protocol.cnf
  support-files/deb/debian/conf.d/performance-dictionary.cnf
  support-files/deb/debian/conf.d/query-log.cnf
  support-files/deb/debian/conf.d/rabbitmq.cnf
  support-files/deb/debian/conf.d/regex-policy.cnf
  support-files/deb/debian/conf.d/simple-user-policy.cnf
  support-files/deb/debian/conf.d/slave.cnf
  support-files/deb/debian/control
  support-files/deb/debian/copyright
  support-files/deb/debian/copyright_check.py
  support-files/deb/debian/drizzle-client.install
  support-files/deb/debian/drizzle-dev-doc.doc-base
  support-files/deb/debian/drizzle-dev-doc.docs
  support-files/deb/debian/drizzle-dev-doc.links
  support-files/deb/debian/drizzle-doc.doc-base
  support-files/deb/debian/drizzle-doc.docs
  support-files/deb/debian/drizzle-doc.links
  support-files/deb/debian/drizzle-plugin-auth-file.install
  support-files/deb/debian/drizzle-plugin-auth-file.postinst
  support-files/deb/debian/drizzle-plugin-auth-http.install
  support-files/deb/debian/drizzle-plugin-auth-ldap.install
  support-files/deb/debian/drizzle-plugin-auth-pam.install
  support-files/deb/debian/drizzle-plugin-auth-schema.install
  support-files/deb/debian/drizzle-plugin-debug.install
  support-files/deb/debian/drizzle-plugin-dev.install
  support-files/deb/debian/drizzle-plugin-gearman-udf.install
  support-files/deb/debian/drizzle-plugin-http-functions.install
  support-files/deb/debian/drizzle-plugin-json-server.install
  support-files/deb/debian/drizzle-plugin-logging-gearman.install
  support-files/deb/debian/drizzle-plugin-logging-query.install
  support-files/deb/debian/drizzle-plugin-performance-dictionary.install
  support-files/deb/debian/drizzle-plugin-query-log.install
  support-files/deb/debian/drizzle-plugin-rabbitmq.install
  support-files/deb/debian/drizzle-plugin-regex-policy.install
  support-files/deb/debian/drizzle-plugin-simple-user-policy.install
  support-files/deb/debian/drizzle-plugin-slave.install
  support-files/deb/debian/drizzle.docs
  support-files/deb/debian/drizzle.init
  support-files/deb/debian/drizzle.install
  support-files/deb/debian/drizzle.preinst
  support-files/deb/debian/drizzle.upstart
  support-files/deb/debian/libdrizzledmessage-dev.install
  support-files/deb/debian/libdrizzledmessage0.install
  support-files/deb/debian/patches/
  support-files/deb/debian/patches/disable-intersphinx.patch
  support-files/deb/debian/patches/fix-user-option.patch
  support-files/deb/debian/patches/series
  support-files/deb/debian/rules
  support-files/deb/debian/slave.cfg
  support-files/deb/debian/source/
  support-files/deb/debian/source/format
  support-files/deb/debian/source/include-binaries
  support-files/deb/debian/watch
  support-files/rpm/
  support-files/rpm/BUILD/
  support-files/rpm/BUILDROOT/
  support-files/rpm/RPMS/
  support-files/rpm/SOURCES/
  support-files/rpm/SOURCES/conf.d/
  support-files/rpm/SOURCES/conf.d/auth-file.cnf
  support-files/rpm/SOURCES/conf.d/auth-http.cnf
  support-files/rpm/SOURCES/conf.d/auth-ldap.cnf
  support-files/rpm/SOURCES/conf.d/auth-pam.cnf
  support-files/rpm/SOURCES/conf.d/auth-schema.cnf
  support-files/rpm/SOURCES/conf.d/debug.cnf
  support-files/rpm/SOURCES/conf.d/filtered-replicator.cnf
  support-files/rpm/SOURCES/conf.d/gearman-udf.cnf
  support-files/rpm/SOURCES/conf.d/http-functions.cnf
  support-files/rpm/SOURCES/conf.d/json-server.cnf
  support-files/rpm/SOURCES/conf.d/logging-gearman.cnf
  support-files/rpm/SOURCES/conf.d/logging-query.cnf
  support-files/rpm/SOURCES/conf.d/mysql-protocol.cnf
  support-files/rpm/SOURCES/conf.d/pbms.cnf
  support-files/rpm/SOURCES/conf.d/query-log.cnf
  support-files/rpm/SOURCES/conf.d/rabbitmq.cnf
  support-files/rpm/SOURCES/conf.d/regex-policy.cnf
  support-files/rpm/SOURCES/conf.d/simple-user-policy.cnf
  support-files/rpm/SOURCES/conf.d/slave.cnf
  support-files/rpm/SOURCES/drizzle-2010.04.1513-bug572633.patch
  support-files/rpm/SOURCES/drizzle-2010.06.1607-protobuf.patch
  support-files/rpm/SOURCES/drizzle.cnf
  support-files/rpm/SOURCES/drizzle7-2011.01.07-tests.patch
  support-files/rpm/SOURCES/drizzled.cnf
  support-files/rpm/SOURCES/drizzled.init
  support-files/rpm/SOURCES/gen_plugin_configs_patch.sh
  support-files/rpm/SOURCES/plugin-configs.patch
  support-files/rpm/SPECS/
  support-files/rpm/SPECS/drizzle.spec.in
  support-files/rpm/SRPMS/
modified:
  .bzrignore
  Makefile.am
  configure.ac
  drizzled/drizzled.cc
  m4/pandora_vc_build.m4
  plugin/innobase/xtrabackup/xtrabackup.cc
  support-files/include.am
  unittests/option_context.cc
pending merge tips: (use -v to see all merge revisions)
  Wajahat Abbassi 2012-04-03 Fixed the bug where --no-defaults was ignored and the configuration file

2537. By Vijay Samuel

Merge 7.1 stable release tag

2536. By Vijay Samuel

Merge translations and release tag 7.1.32-rc

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
lp:drizzle
This branch contains Public information 
Everyone can see this information.

Subscribers