← Back to branch summary

~drizzle-trunk/drizzle/development

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/transaction_log/transaction_log.h

Committer: Brian Aker
Date: 2010-11-13 03:36:33 UTC
mto: This revision was merged to the branch mainline in revision 1929.
Revision ID: brian@tangent.org-20101113033633-3v9ep5ow832wmf4s

Merge up the tree.

files added:
plugin/session_dictionary/tests/r/user_variable.result

plugin/session_dictionary/tests/t/user_variable.test

plugin/session_dictionary/variables.cc

plugin/session_dictionary/variables.h

files modified:
drizzled/session.h

drizzled/user_var_entry.cc

plugin/information_schema_dictionary/tests/r/tables.result

plugin/schema_dictionary/tests/r/data_dictionary.result

plugin/session_dictionary/dictionary.cc

plugin/session_dictionary/dictionary.h

plugin/session_dictionary/plugin.ini

tests/r/information_schema.result

Show diffs side-by-side

added added

removed removed

plugin/transaction_log/transaction_log.h

Older »