lp://staging/~drizzle-trunk/drizzle/7.2-staging

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #385808: crash with select after adding autoinc pkey	Critical	Fix Released
Bug #440264: drizzled crashes on startup if dead dfe file exists in /tmp/	Critical	Fix Released

Link a bug report

Related blueprints

2588. By Drizzle Continuous Integration on 2012-09-05

Merge lp:~tobi-coldtobi/drizzle/trunk-bug-983258

2587. By Drizzle Continuous Integration on 2012-09-04

Merge lp:~tobi-coldtobi/drizzle/trunk-bug-1041314

2586. By Drizzle Continuous Integration on 2012-08-24

modified:
  drizzled/drizzled.cc
pending merge tips: (use -v to see all merge revisions)
  Tobias Frost 2012-08-19 Adding patch used in Debian for support on FreeBSD.

2585. By Drizzle Continuous Integration on 2012-08-23

modified:
  plugin/mysql_unix_socket_protocol/protocol.cc
pending merge tips: (use -v to see all merge revisions)
  Tobias Frost 2012-08-19 Fix from Debian for Debian bug 631107, mysql_unix_socket_protocol : socket file (/tmp/mysql.sock) has wrong permissions.

2584. By Drizzle Continuous Integration on 2012-08-22

added:
  tests/lib/util/database_connect.py
  tests/lib/util/drizzleslap_methods.py
  tests/lib/util/mailing_report.py
  tests/lib/util/sysbenchTestCase.py
  tests/qp_tests/drizzleslap/
  tests/qp_tests/drizzleslap/drizzleslap_test.py
  tests/qp_tests/sysbench/sysbench_readwrite_test.py
  tests/std_data/sysbench_db.sql
modified:
  docs/testing/kewpie.rst
  docs/testing/sysbench.rst
  tests/lib/modes/native/native_test_execution.py
  tests/lib/opts/test_run_options.py
  tests/lib/server_mgmt/drizzled.py
  tests/lib/server_mgmt/server.py
  tests/lib/sys_mgmt/system_management.py
  tests/lib/util/crashme_methods.py
  tests/lib/util/mysql_methods.py
  tests/lib/util/sysbench_methods.py
  tests/qp_tests/crashme/crashme_test.py
  tests/qp_tests/sqlbench/sqlbench_test.py
  tests/qp_tests/sysbench/sysbench_readonly_test.py
pending merge tips: (use -v to see all merge revisions)
  M.Sharan Kumar 2012-08-21 [merge] This branch consists of the work done in connection with GSoC.

2583. By Drizzle Continuous Integration on 2012-08-21

modified:
  drizzled/execute/scanner.l
  plugin/rabbitmq/rabbitmq_handler.cc
pending merge tips: (use -v to see all merge revisions)
  Tobias Frost 2012-08-19 For Debian I needed to introduce a patch to make it build using the gcc-4.7 (default in Debian).

2582. By Drizzle Continuous Integration on 2012-08-20

modified:
  plugin/rabbitmq/rabbitmq_handler.cc
  plugin/rabbitmq/rabbitmq_handler.h
  plugin/rabbitmq/rabbitmq_log.cc
  plugin/rabbitmq/rabbitmq_log.h
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-08-07 RabbitMQ dynamic plugin

2581. By Drizzle Continuous Integration on 2012-08-14

added:
  bootstrap.sh
modified:
  client/drizzletest.cc
  drizzled/field/datetime.cc
  drizzled/filesort.cc
  drizzled/function/time/unix_timestamp.cc
  drizzled/sql_insert.cc
  drizzled/sql_load.cc
  drizzled/sql_union.cc
  drizzled/table/cache.cc
  drizzled/table_function_container.cc
  plugin/logging_query/logging_query.cc
  plugin/schema_engine/schema.cc
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-08-11 [merge] added:

2580. By Drizzle Continuous Integration on 2012-08-10

added:
  plugin/logging_query/tests/
  plugin/logging_query/tests/parse-query-log.sh
  plugin/logging_query/tests/r/
  plugin/logging_query/tests/r/file.result
  plugin/logging_query/tests/r/thresholds.result
  plugin/logging_query/tests/t/
  plugin/logging_query/tests/t/file.test
  plugin/logging_query/tests/t/master.opt
  plugin/logging_query/tests/t/thresholds.test
modified:
  plugin/logging_query/logging_query.cc
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-07-10 Removed hard coded file paths in test suite

2579. By Drizzle Continuous Integration on 2012-08-06

modified:
  plugin/syslog/errmsg.cc
  plugin/syslog/errmsg.h
  plugin/syslog/function.cc
  plugin/syslog/function.h
  plugin/syslog/logging.cc
  plugin/syslog/logging.h
  plugin/syslog/module.cc
  plugin/syslog/wrap.cc
  plugin/syslog/wrap.h
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-08-06 Sysvars changed to public variable to remove setter functions