Drizzle

Merge lp://qastaging/~mordred/drizzle/some-random-things into lp://qastaging/drizzle/7.0

Proposed by Monty Taylor on 2011-02-16

Status:	Merged
Approved by:	Monty Taylor on 2011-02-19
Approved revision:	no longer in the source branch.
Merged at revision:	2185
Proposed branch:	lp://qastaging/~mordred/drizzle/some-random-things
Merge into:	lp://qastaging/drizzle/7.0
Diff against target:	251 lines (+63/-49) 7 files modified drizzled/drizzled.cc (+42/-43) drizzled/sys_var.cc (+16/-1) drizzled/sys_var.h (+1/-1) m4/pandora_canonical.m4 (+1/-1) plugin/innobase/handler/ha_innodb.cc (+1/-1) plugin/logging_gearman/logging_gearman.cc (+1/-1) plugin/logging_query/logging_query.cc (+1/-1)
To merge this branch:	bzr merge lp://qastaging/~mordred/drizzle/some-random-things
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Lee Bieber (community)		2011-02-16	Needs Fixing on 2011-02-17
Review via email: mp+49917@code.qastaging.launchpad.net

Some random things I saw while working on something else.

2173. By Lee Bieber on 2011-02-16: Merge Stewart - remove unused macros
Merge Olaf - remove old style casts
Merge Stewart remove unused macros in drizzledump
Merge Andrew - 718657: Several errors in Date/Time docs
Merge Olaf - Move strfunc functions into TYPELIB class
2174. By Lee Bieber on 2011-02-17: Merge Andrew - 719892 Change docs for rpm.drizzle.org
Merge Patrick - 719445: dbqp not being included in tarballs / make distcheck
Merge Stewart - remove some unused cmd line options for drizzledump
Merge Marisa - 716062 - fix ubuntu install doc

Revision history for this message

Lee Bieber (kalebral-deactivatedaccount) wrote on 2011-02-17:

Needs to be re-merged with trunk

Text conflict in drizzled/drizzled.cc
1 conflicts encountered.

review: Needs Fixing

2175. By Lee Bieber on 2011-02-17: Merge Patrick - 709646: --engine in dbqp.py is broken
Merge Patrick - 717359: dbqp needs --repeat option
2176. By Lee Bieber on 2011-02-17: Merge Stewart fix some conversions from String to std::string in EXPLAIN codepath
2177. By Lee Bieber on 2011-02-17: Merge Brian - add the DDL for replication
2178. By Brian Aker on 2011-02-17: Merge Monty for headers.
2179. By Brian Aker on 2011-02-17: Merge in all bison updates.
2180. By Brian Aker on 2011-02-18: Test removing register.
2181. By Brian Aker on 2011-02-18: Rollup all of Olaf's branch.
2182. By Brian Aker on 2011-02-18: Rollup of:
    Andrew Hutchings 2011-02-18 Set the REPLICATION to FALSE for SYS_REPLICATION_LOG as we don't want to long manual changes to it
    Andrew Hutchings 2011-02-18 Backport fix from http://bugs.mysql.com/bug.php?id=59149 which crashed drizzed
    Andrew Hutchings 2011-02-17 More fixups for drizzledump docs:
2183. By Lee Bieber on 2011-02-18: Merge Brian - add safe_delete()
Merge Stewart - 720552: doStartIndexScan return code ignored in optimizer::sum_query() for MIN() optimization
Merge Olaf - add register keyword
Merge Patrick - 720813: syntax error in dbqp that is breaking it