lp:~linuxjedi/drizzle/trunk-super-root-localhost

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp:drizzle/7.0

Drizzle Developers: Pending requested 2010-11-24

Diff: 97 lines (+17/-1)

6 files modified

drizzled/constrained_value.h (+1/-0)
drizzled/drizzled.cc (+3/-0)
drizzled/session.cc (+8/-0)
drizzled/sys_var.cc (+2/-0)
drizzled/sys_var.h (+1/-0)
plugin/mysql_protocol/net_serv.cc (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1953. By Andrew Hutchings on 2010-11-24

Add max-connections variable

1952. By Patrick Crews on 2010-11-24

Updated innobase plugin.ini file to fix tarball for release

1951. By Patrick Crews on 2010-11-23

Updated translations

1950. By Lee Bieber on 2010-11-23

Merge Monty - fix bug 675395: checking for x86 PAUSE instruction... no is wrong

1949. By Lee Bieber on 2010-11-23

Merge Patrick - add execute tests

1948. By Brian Aker on 2010-11-23

Merge in changes for barriers (update for kill, etc).

1947. By Brian Aker on 2010-11-23

Refactor basic lock bits (ie, encapsulate!)

1946. By Lee Bieber on 2010-11-23

Merge Monty - fix bug 675670: Drizzle falsely reporting conflicts with tmp/mysql.socket but starts normally

1945. By Brian Aker on 2010-11-21

Merge in simple change such that we use the KEY we already have, instead of
recalculating one.

1944. By Lee Bieber on 2010-11-20

Merge Brian - refactor share