modified:
  client/conclusions.h
  client/drizzledump.cc
  client/drizzledump_data.h
  client/drizzledump_drizzle.cc
  client/drizzledump_mysql.cc
  client/drizzleimport.cc
  client/include.am
  client/option_string.h
  client/server_detect.cc
  client/statement.h
  client/stats.h
  client/thread_context.h
  drizzled/identifier/catalog.cc
  drizzled/identifier/constants/schema.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/table.cc
  drizzled/include.am
  drizzled/main.cc
  plugin/innobase/dict/dict0dict.cc
  plugin/innobase/handler/ha_innodb.cc
  plugin/innobase/plugin.am
  plugin/innobase/tests/r/innodb-system-table-view.result
  plugin/tableprototester/tableprototester.cc
  tests/r/broken_table_proto_file.result
  unittests/include.am
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-23 Update to add in dependency for unittest