lp:~linuxjedi/drizzle/trunk-admin-tool

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle/7.0 at revision 2006

Drizzle Developers: Pending requested 2010-12-13

Diff: 689 lines (+206/-24)

24 files modified

client/drizzle.cc (+18/-1)
client/include.am (+9/-0)
drizzled/enum.h (+1/-0)
drizzled/error.cc (+2/-0)
drizzled/session.h (+1/-0)
libdrizzle/constants.h (+5/-2)
libdrizzle/handshake.c (+3/-0)
plugin/csv/tests/t/uuid_type.test (+1/-1)
plugin/drizzle_protocol/drizzle_protocol.cc (+33/-1)
plugin/drizzle_protocol/drizzle_protocol.h (+12/-2)
plugin/memory/tests/t/primary_key.test (+1/-1)
plugin/mysql_protocol/mysql_protocol.cc (+57/-5)
plugin/mysql_protocol/mysql_protocol.h (+10/-2)
plugin/mysql_protocol/options.h (+3/-0)
plugin/mysql_protocol/prototest/drizzle_prototest (+3/-2)
plugin/mysql_protocol/tests/r/prototest.result (+1/-1)
plugin/mysql_unix_socket_protocol/protocol.cc (+9/-0)
plugin/mysql_unix_socket_protocol/protocol.h (+10/-0)
tests/r/drizzleadmin.result (+1/-4)
tests/suite/uuid_type/t/insert_null_no_key.test (+1/-1)
tests/suite/uuid_type/t/primary_key.test (+1/-1)
tests/t/drizzleadmin-master.opt (+1/-0)
tests/t/drizzleadmin.test (+13/-0)
tests/test-run.pl (+10/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1975. By Andrew Hutchings on 2010-12-17

Fix CSV and Memory tests

1974. By Andrew Hutchings on 2010-12-17

Merge trunk into branch

1973. By Andrew Hutchings on 2010-12-15

Make the test look for drizzleadmin failure instead of success as this test is not possible to fix for success on our FreeBSD 8.0 box

1972. By Andrew Hutchings on 2010-12-14

Fix drizzleadmin test to work on IPV6 servers too

1971. By Andrew Hutchings on 2010-12-14

Fix prototest test result (forgot to re-record after changing prototest)

1970. By Andrew Hutchings on 2010-12-13

testMaxRangeClientHandshake was toggling the admin flag causing a different error to that intended. When correcting this the test turned out be the same as the following test, so instead made this test expect the admin error.

1969. By Andrew Hutchings on 2010-12-13

Fix extra output in drizzleadmin test

1968. By Andrew Hutchings on 2010-12-13

Modify dtr to cope with drizzleadmin and create test case

1967. By Andrew Hutchings on 2010-12-13

Drop the drizzleadmin client and use ifdef instead

1966. By Andrew Hutchings on 2010-12-13

Add ip address limitation for admin connections