← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/http_functions/plugin.cnf

Committer: Mark Atwood
Date: 2011-05-12 22:20:08 UTC
mfrom: (2283.4.17 json-interface)
Revision ID: me@mark.atwood.name-20110512222008-7facdn0qu7lsbm0g

merge lp:~stewart/drizzle/json-interface

files added:
plugin/http_functions

plugin/http_functions/http_functions.cc

plugin/http_functions/plugin.ac

plugin/http_functions/plugin.cnf

plugin/http_functions/plugin.ini

plugin/json_server

plugin/json_server/json

plugin/json_server/json/autolink.h

plugin/json_server/json/config.h

plugin/json_server/json/features.h

plugin/json_server/json/forwards.h

plugin/json_server/json/json.h

plugin/json_server/json/json_batchallocator.h

plugin/json_server/json/json_internalarray.inl

plugin/json_server/json/json_internalmap.inl

plugin/json_server/json/json_reader.cpp

plugin/json_server/json/json_value.cpp

plugin/json_server/json/json_valueiterator.inl

plugin/json_server/json/json_writer.cpp

plugin/json_server/json/reader.h

plugin/json_server/json/value.h

plugin/json_server/json/writer.h

plugin/json_server/json_server.cc

plugin/json_server/plugin.ac

plugin/json_server/plugin.ini

plugin/json_server/tests

plugin/json_server/tests/r

plugin/json_server/tests/r/basic.result

plugin/json_server/tests/t

plugin/json_server/tests/t/basic.test

plugin/json_server/tests/t/master.opt

files modified:
drizzled/plugin/client/cached.h

drizzled/sql/result_set.h

drizzled/sql/result_set_meta_data.h

po/POTFILES.in

tests/lib/drizzle_test_run/dtr_test_execution.py

tests/lib/server_mgmt/drizzled.py

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

plugin/http_functions/plugin.cnf

1

plugin-add=http_functions

2

Older »