← Back to branch summary

~mordred/drizzle/merge-pandora-build

~mordred/drizzle/merge-pandora-build

Viewing all changes in revision 2006.

Committer: Brian Aker
Date: 2010-12-17 22:19:09 UTC
mfrom: (1960.2.15 trunk-admin-tool)
Revision ID: brian@tangent.org-20101217221909-gsltcrjo302qjx26

Merge of Andrew

files added:
tests/t/drizzleadmin-master.opt

tests/t/drizzleadmin.test

files modified:
client/drizzle.cc

client/include.am

drizzled/enum.h

drizzled/error.cc

drizzled/session.h

libdrizzle/constants.h

libdrizzle/handshake.c

plugin/csv/tests/t/uuid_type.test

plugin/drizzle_protocol/drizzle_protocol.cc

plugin/drizzle_protocol/drizzle_protocol.h

plugin/memory/tests/t/primary_key.test

plugin/mysql_protocol/mysql_protocol.cc

plugin/mysql_protocol/mysql_protocol.h

plugin/mysql_protocol/options.h

plugin/mysql_protocol/prototest/drizzle_prototest

plugin/mysql_protocol/tests/r/prototest.result

plugin/mysql_unix_socket_protocol/protocol.cc

plugin/mysql_unix_socket_protocol/protocol.h

tests/r/drizzleadmin.result

tests/suite/uuid_type/t/insert_null_no_key.test

tests/suite/uuid_type/t/primary_key.test

tests/test-run.pl

Show diffs side-by-side

added added

removed removed

client/drizzle.cc

client/include.am

drizzled/enum.h

drizzled/error.cc

drizzled/session.h

libdrizzle/constants.h

libdrizzle/handshake.c

plugin/csv/tests/t/uuid_type.test

plugin/drizzle_protocol/drizzle_protocol.cc

plugin/drizzle_protocol/drizzle_protocol.h

plugin/memory/tests/t/primary_key.test

plugin/mysql_protocol/mysql_protocol.cc

plugin/mysql_protocol/mysql_protocol.h

plugin/mysql_protocol/options.h

plugin/mysql_protocol/prototest/drizzle_prototest

plugin/mysql_protocol/tests/r/prototest.result

plugin/mysql_unix_socket_protocol/protocol.cc

plugin/mysql_unix_socket_protocol/protocol.h

tests/r/drizzleadmin.result

tests/suite/uuid_type/t/insert_null_no_key.test

tests/suite/uuid_type/t/primary_key.test

tests/t/drizzleadmin-master.opt

tests/t/drizzleadmin.test

tests/test-run.pl

Older »