lp:~brianaker/drizzle/1st-catalog-patch

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle at revision 2547

Drizzle Trunk: Pending requested 2012-04-22

Diff: 718 lines (+192/-134)

25 files modified

client/conclusions.h (+1/-1)
client/drizzledump.cc (+1/-1)
client/drizzledump_data.h (+2/-2)
client/drizzledump_drizzle.cc (+1/-1)
client/drizzledump_mysql.cc (+3/-3)
client/drizzleimport.cc (+1/-1)
client/include.am (+101/-73)
client/option_string.h (+1/-1)
client/server_detect.cc (+1/-1)
client/statement.h (+1/-1)
client/stats.h (+1/-1)
client/thread_context.h (+2/-2)
drizzled/identifier/catalog.cc (+1/-1)
drizzled/identifier/constants/schema.cc (+4/-11)
drizzled/identifier/schema.cc (+2/-0)
drizzled/identifier/table.cc (+3/-1)
drizzled/include.am (+4/-4)
drizzled/main.cc (+0/-5)
plugin/innobase/dict/dict0dict.cc (+13/-2)
plugin/innobase/handler/ha_innodb.cc (+25/-0)
plugin/innobase/plugin.am (+1/-0)
plugin/innobase/tests/r/innodb-system-table-view.result (+9/-9)
plugin/tableprototester/tableprototester.cc (+8/-8)
tests/r/broken_table_proto_file.result (+1/-1)
unittests/include.am (+5/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2552. By Brian Aker on 2012-04-23

Update to add in dependency for unittest

2551. By Brian Aker on 2012-04-23

Make -j compile issues.

2550. By Brian Aker on 2012-04-23

Update dependencies.

2549. By Brian Aker on 2012-04-23

Fix for Ubuntu.

2548. By Brian Aker on 2012-04-22

Unittests (never worked, you can't load the server as a library).

2547. By Brian Aker on 2012-04-22

Merge of Stewart's catalog patch (first of the series).

2546. By Drizzle Continuous Integration on 2012-04-21

modified:
  plugin/regex_policy/module.cc
  plugin/regex_policy/policy.h
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-04-08 Refactor

2545. By Drizzle Continuous Integration on 2012-04-21

added:
  tests/suite/regression/r/986455.result
  tests/suite/regression/t/986455.test
modified:
  .bzrignore
  drizzled/drizzled.cc
  drizzled/identifier/schema.cc
  drizzled/identifier/schema.h
  drizzled/identifier/table.cc
  drizzled/identifier/table.h
  drizzled/table/instance/base.cc
  drizzled/util/backtrace.cc
  drizzled/util/backtrace.h
  libdrizzle-1.0/t/drizzle_con_st.c
  libdrizzle/conn.cc
  plugin/mysql_unix_socket_protocol/protocol.cc
  plugin/slave/queue_producer.cc
pending merge tips: (use -v to see all merge revisions)
  Continuous Integr... 2012-04-20 [merge] added:

2544. By Drizzle Continuous Integration on 2012-04-20

modified:
  tests/test-run.pl
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-07 Update test-run.pl for valgrind.

2543. By Drizzle Continuous Integration on 2012-04-19

modified:
  drizzled/execute/parser.yy
  drizzled/util/find_ptr.h
  plugin/user_locks/barriers.cc
pending merge tips: (use -v to see all merge revisions)
  Olaf van der Spek 2012-04-07 Improve find_ptr