lp:~ajayaa/drizzle/trunk-bug-951788

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle at revision 2556

Andrew Hutchings: Approve on 2012-04-20

Stewart Smith: Pending requested 2012-04-16

Diff: 77 lines (+22/-27)

1 file modified

client/server_detect.cc (+22/-27)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #951788: Client ServerDetect() guesses server type (Drizzle, MySQL) based on version number.

Medium

Fix Released

Link a bug report

Related blueprints

2544. By Ajaya Agrawal on 2012-04-20

2543. By Ajaya Agrawal on 2012-04-18

fix for bug 951788

2542. By Ajaya Agrawal on 2012-04-17

fixed bug for serverdetect.cc

2541. By Ajaya Agrawal on 2012-04-17

2540. By Ajaya Agrawal on 2012-04-16

2539. By Drizzle Continuous Integration on 2012-04-03

added:
  tests/kewpie/drizzle_tests/xtrabackup_disabled/
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug514068_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug606981_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug722638_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug723097_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug729843_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug733663_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug759225_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug766607_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug810269_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug817132_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/bug884737_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/galeraInfo_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_basic_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_csm_csv_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_databases_test_disabled.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_incremental_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_nonempty_dir_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_parallel_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_rsync_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_slave_info_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_slave_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_specialchar_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/ib_stream_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/tar4ibd_symlink_test.py
  tests/kewpie/drizzle_tests/xtrabackup_disabled/xb_stats_sakila_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_defaults_file_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_export_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_incremental_compressed_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_incremental_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_log_overwrap_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_part_range_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_partial_test.py
  tests/kewpie/drizzle_tests/xtrabackup_main/xb_stats_test.py
modified:
  tests/kewpie/lib/opts/defaults.py
  tests/kewpie/lib/server_mgmt/drizzled.py
pending merge tips: (use -v to see all merge revisions)
  Patrick Crews 2012-03-26 Fixing various errors / drizzle-specific things in the tests

2538. By Drizzle Continuous Integration on 2012-04-01

added:
  plugin/regex_policy/tests/r/basic_deprecated.result
  plugin/regex_policy/tests/t/basic_deprecated-master.opt
  plugin/regex_policy/tests/t/basic_deprecated.policy
  plugin/regex_policy/tests/t/basic_deprecated.test
modified:
  plugin/regex_policy/docs/index.rst
  plugin/regex_policy/module.cc
  plugin/regex_policy/policy.h
  plugin/regex_policy/tests/t/basic.policy
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-03-31 Changed the version of regex_policy plugin. Also adding basic.policy in the patch.

2537. By Tangent.Org Continuous Integration on 2012-04-01

modified:
  drizzled/drizzled.cc
  plugin/innobase/xtrabackup/xtrabackup.cc
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-03-24 Fix some GCC 4.7 warnings

2536. By Tangent.Org Continuous Integration on 2012-03-27

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
  m4/pandora_vc_build.m4
  support-files/include.am
pending merge tips: (use -v to see all merge revisions)
  Henrik Ingo 2012-03-27 Adding a copyright license header to 2 files that didn't pass Jenkins

2535. By Tangent.Org Continuous Integration on 2012-03-22

added:
  plugin/regex_policy/tests/r/cache_overflow.result
  plugin/regex_policy/tests/t/cache_overflow-master.opt
  plugin/regex_policy/tests/t/cache_overflow.test
modified:
  plugin/regex_policy/module.cc
  plugin/regex_policy/policy.h
pending merge tips: (use -v to see all merge revisions)
  Clint Byrum 2012-03-16 fixing build failure caused by merge w/ trunk