Merge lp:drizzle/7.0 into lp:drizzle

Proposed by Chaz on 2015-07-05
Status: Merged
Merge reported by: Chaz
Merged at revision: not available
Proposed branch: lp:drizzle/7.0
Merge into: lp:drizzle
Diff against target: 20 lines (+11/-0) (has conflicts)
1 file modified
plugin/haildb/plugin.ini.OTHER (+11/-0)
Conflict adding files to plugin/haildb.  Created directory.
Conflict because plugin/haildb is not versioned, but has versioned children.  Versioned directory.
Contents conflict in plugin/haildb/plugin.ini
To merge this branch: bzr merge lp:drizzle/7.0
Reviewer Review Type Date Requested Status
Drizzle Trunk 2015-07-05 Pending
Review via email: mp+263847@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'plugin/haildb'
2=== added file 'plugin/haildb/plugin.ini.OTHER'
3--- plugin/haildb/plugin.ini.OTHER 1970-01-01 00:00:00 +0000
4+++ plugin/haildb/plugin.ini.OTHER 2015-07-05 14:59:50 +0000
5@@ -0,0 +1,11 @@
6+[plugin]
7+title=HailDB storage engine
8+description=Uses the HailDB library to implement a storage engine for Drizzle.
9+sources=haildb_engine.cc haildb_datadict_dump_func.cc config_table_function.cc status_table_function.cc datadict_table_message.cc
10+headers=haildb_engine.h haildb_datadict_dump_func.h config_table_function.h status_table_function.h
11+build_conditional="x${ac_cv_libhaildb}" = "xyes"
12+ldflags=${LTLIBHAILDB}
13+testsuite=disable
14+load_by_default=no
15+static=no
16+disabled=yes
17
18=== modified file 'plugin/schema_dictionary/tests/r/data_dictionary.result'
19=== modified file 'plugin/session_dictionary/sessions.cc'
20=== modified file 'plugin/slave/queue_producer.cc'

Subscribers

People subscribed via source and target branches