lp:~tobi-coldtobi/drizzle/trunk-bug-983258

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle at revision 2588

Brian Aker: Needs Information on 2012-08-19

Clint Byrum (community): Approve on 2012-08-19

Diff: 27 lines (+6/-4)

1 file modified

drizzled/drizzled.cc (+6/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #983258: drizzled: --help should work in any circumstances

Medium

Fix Released

Link a bug report

Related blueprints

2581. By coldtobi on 2012-08-19

Applying patch from Debian for LP #983258. (with some fuzziness)

2580. By Drizzle Continuous Integration on 2012-08-10

added:
  plugin/logging_query/tests/
  plugin/logging_query/tests/parse-query-log.sh
  plugin/logging_query/tests/r/
  plugin/logging_query/tests/r/file.result
  plugin/logging_query/tests/r/thresholds.result
  plugin/logging_query/tests/t/
  plugin/logging_query/tests/t/file.test
  plugin/logging_query/tests/t/master.opt
  plugin/logging_query/tests/t/thresholds.test
modified:
  plugin/logging_query/logging_query.cc
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-07-10 Removed hard coded file paths in test suite

2579. By Drizzle Continuous Integration on 2012-08-06

modified:
  plugin/syslog/errmsg.cc
  plugin/syslog/errmsg.h
  plugin/syslog/function.cc
  plugin/syslog/function.h
  plugin/syslog/logging.cc
  plugin/syslog/logging.h
  plugin/syslog/module.cc
  plugin/syslog/wrap.cc
  plugin/syslog/wrap.h
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-08-06 Sysvars changed to public variable to remove setter functions

2578. By Drizzle Continuous Integration on 2012-08-01

modified:
  drizzled/lex_input_stream.h
  drizzled/sql_lex.cc
  drizzled/sql_parse.cc
  drizzled/statement/execute.cc
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-05-31 Use str_ref

2577. By Brian Aker on 2012-07-31

Merge Olaf

2576. By Drizzle Continuous Integration on 2012-07-30

modified:
  drizzled/main.cc
  drizzled/signal_handler.cc
  drizzled/signal_handler.h
pending merge tips: (use -v to see all merge revisions)
  denisboyun 2012-06-07 [merge] Ctrl-C/Z are worked(resolve conflict)

2575. By Drizzle Continuous Integration on 2012-07-29

modified:
  plugin/logging_gearman/docs/index.rst
  plugin/logging_gearman/logging_gearman.cc
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-06-20 Few changes in code. Documentation added for functions.

2574. By Drizzle Continuous Integration on 2012-07-27

modified:
  drizzled/catalog/instance.h
  drizzled/cursor.cc
  drizzled/identifier/catalog.h
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/schema.h
  drizzled/identifier/table.cc
  drizzled/identifier/table.h
  drizzled/locking/global.cc
  drizzled/message/schema.cc
  drizzled/message/schema.h
  drizzled/plugin/storage_engine.cc
  drizzled/plugin/table_function.h
  drizzled/schema.cc
  drizzled/session.cc
  drizzled/show.cc
  drizzled/sql_base.cc
  drizzled/sql_load.cc
  drizzled/sql_parse.cc
  drizzled/sql_table.cc
  drizzled/sql_table.h
  drizzled/statement/alter_schema.cc
  drizzled/statement/alter_table.cc
  drizzled/statement/change_schema.cc
  drizzled/statement/create_index.cc
  drizzled/statement/create_schema.cc
  drizzled/statement/create_table.cc
  drizzled/statement/drop_index.cc
  drizzled/statement/drop_schema.cc
  drizzled/statement/rename_table.cc
  drizzled/table/concurrent.cc
  drizzled/table/instance/base.cc
  drizzled/table/instance/base.h
  drizzled/table/singular.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/memory/ha_heap.cc
  plugin/schema_engine/schema.cc
  plugin/schema_engine/schema.h
  plugin/show_dictionary/show_columns.cc
  plugin/show_dictionary/show_create_schema.cc
  plugin/show_dictionary/show_create_table.cc
  plugin/show_dictionary/show_indexes.cc
  plugin/show_dictionary/show_tables.cc
  plugin/show_schema_proto/show_schema_proto.cc
  plugin/table_cache_dictionary/tests/r/table_cache.result
  plugin/table_cache_dictionary/tests/r/table_definition_cache.result
  tests/r/show_check.result
  unittests/table_identifier.cc
pending merge tips: (use -v to see all merge revisions)
  Stewart Smith 2012-07-12 fix initialization of message::schema to be from the Schema identifier, which includes the CATALOG name, so that we can create schemas in catalogs other than LOCAL

2573. By Drizzle Continuous Integration on 2012-07-26

added:
  plugin/json_server/http_server.cc
  plugin/json_server/http_server.h
modified:
  plugin/json_server/docs/index.rst
  plugin/json_server/json_server.cc
  plugin/json_server/plugin.ini
  plugin/json_server/tests/r/basic.result
  plugin/json_server/tests/t/basic.test
pending merge tips: (use -v to see all merge revisions)
  srivastavamohit91... 2012-07-17 changes in _api01

2572. By Drizzle Continuous Integration on 2012-07-25

modified:
  plugin/zeromq/zeromq_log.cc
  plugin/zeromq/zeromq_log.h
pending merge tips: (use -v to see all merge revisions)
  Anshu Kumar 2012-07-10 Added mutex lock around code changing endpoint