lp:~stewart/drizzle/json-interface

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~drizzle-trunk/drizzle/development at revision 2310

Mark Atwood: Needs Fixing on 2011-05-12

Drizzle Merge Team: Pending requested 2011-05-04

Diff: 7884 lines (+7638/-3)

32 files modified

drizzled/plugin/client/cached.h (+1/-0)
drizzled/sql/result_set.h (+5/-0)
drizzled/sql/result_set_meta_data.h (+6/-1)
plugin/http_functions/http_functions.cc (+199/-0)
plugin/http_functions/plugin.ac (+4/-0)
plugin/http_functions/plugin.cnf (+2/-0)
plugin/http_functions/plugin.ini (+6/-0)
plugin/json_server/json/autolink.h (+58/-0)
plugin/json_server/json/config.h (+81/-0)
plugin/json_server/json/features.h (+80/-0)
plugin/json_server/json/forwards.h (+77/-0)
plugin/json_server/json/json.h (+48/-0)
plugin/json_server/json/json_batchallocator.h (+163/-0)
plugin/json_server/json/json_internalarray.inl (+486/-0)
plugin/json_server/json/json_internalmap.inl (+645/-0)
plugin/json_server/json/json_reader.cpp (+921/-0)
plugin/json_server/json/json_value.cpp (+1759/-0)
plugin/json_server/json/json_valueiterator.inl (+330/-0)
plugin/json_server/json/json_writer.cpp (+862/-0)
plugin/json_server/json/reader.h (+234/-0)
plugin/json_server/json/value.h (+1107/-0)
plugin/json_server/json/writer.h (+212/-0)
plugin/json_server/json_server.cc (+284/-0)
plugin/json_server/plugin.ac (+1/-0)
plugin/json_server/plugin.ini (+12/-0)
plugin/json_server/tests/r/basic.result (+35/-0)
plugin/json_server/tests/t/basic.test (+10/-0)
plugin/json_server/tests/t/master.opt (+1/-0)
po/POTFILES.in (+1/-0)
tests/lib/drizzle_test_run/dtr_test_execution.py (+1/-0)
tests/lib/server_mgmt/drizzled.py (+2/-2)
tests/test-run.pl (+5/-0)

api

Related source package recipes

2 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2300. By Stewart Smith on 2011-05-04

merge Brian's fixes

2299. By Stewart Smith on 2011-05-02

merge trunk

2298. By Stewart Smith on 2011-05-02

use http_post() function to test json_server

2297. By Stewart Smith on 2011-05-02

require http_functions to be able to be built to build json_server so that tests can be run

2296. By Stewart Smith on 2011-05-02

add basic http_functions plugin. uses libcurl

2295. By Stewart Smith on 2011-05-02

fix what port we run json_server on

2294. By Stewart Smith on 2011-04-29

merge truk

2293. By Stewart Smith on 2011-04-21

add json_server.cc to POTFILES.in

2292. By Stewart Smith on 2011-04-21

add JSON_SERVER_PORT to test-run.pl and dbqp. Make the basic json_server test actually test something useful, such as interaction between SQL from normal protocol and SQL from http

2291. By Stewart Smith on 2011-04-21

fix a bug in json_server so that we execute the query in the text box instead of the underlaying innerHTML