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

Branch merges

Propose for merging

27 branches proposed for merging into this one.

No branches dependent on this one.

Ready for review for merging into lp://staging/drizzle

Drizzle Trunk: Pending requested 2014-08-25

Diff: 0 lines api

Related source package recipes

1 recipe using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

Merged branch lp://staging/~clint-fewbar/drizzle/regex-policy-cache-limiter

2534. By Tangent.Org Continuous Integration on 2012-03-21

modified:
  docs/columntypes.rst
  docs/ipv6_data_type.rst
  plugin/ipv6_function/plugin.ini
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-03-21 [merge] Merge docs

Merged branch lp://staging/~hingo/drizzle/disable-ipv6-function

Bug #956420: ipv6 function crashes server

2533. By Tangent.Org Continuous Integration on 2012-03-20

modified:
  drizzled/drizzled.cc
pending merge tips: (use -v to see all merge revisions)
  Mohit 2012-03-20 Space between << and " and << modify.

Merged branch lp://staging/~mohyt/drizzle/trunk-bug-943657

Bug #943657: Better error message on startup / drizzled.cc

2532. By Tangent.Org Continuous Integration on 2012-03-18

modified:
  drizzled/drizzled.cc
  drizzled/main.cc
  plugin/signal_handler/signal_handler.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-03-17 [merge] Merge of create pid bug fix.

Merged branch lp://staging/~brianaker/drizzle/pid-file-fix

2531. By Brian Aker on 2012-03-18

Merge in updated replication documentation.

Merged branch lp://staging/~drizzle-developers/drizzle/replication-docs-7.1

2530. By Brian Aker on 2012-03-18

Merge Henrik's changes.

Merged branch lp://staging/~hingo/drizzle/authors-intro

2529. By Brian Aker on 2012-03-18

Merge Authors.

2528. By Tangent.Org Continuous Integration on 2012-03-18

modified:
  AUTHORS
pending merge tips: (use -v to see all merge revisions)
  Henrik Ingo 2012-03-17 Add myself to authors.

Merged branch lp://staging/~hingo/drizzle/add-hingo-to-authors

2527. By Tangent.Org Continuous Integration on 2012-03-15

modified:
  tests/kewpie/randgen/lib/GenTest/Incident.pm
  tests/kewpie/randgen/lib/GenTest/Reporter/Backtrace.pm
  tests/kewpie/randgen/lib/GenTest/Reporter/ReplicationSemiSync.pm
  tests/kewpie/randgen/lib/GenTest/XML/BuildInfo.pm
  tests/kewpie/randgen/lib/GenTest/XML/Environment.pm
  tests/kewpie/randgen/lib/GenTest/XML/Report.pm
  tests/kewpie/randgen/lib/GenTest/XML/Test.pm
  tests/kewpie/randgen/lib/GenTest/XML/Transporter.pm
  tests/kewpie/randgen/pb2runtest.pl
  tests/kewpie/randgen/t/test.bat
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-03-14 Fix EOLs

2526. By Tangent.Org Continuous Integration on 2012-03-14

Merging bzr://localhost/drizzle/show to Build branch