lp:~brianaker/drizzle/libdrizzle-fix

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:drizzle/7.1 at revision 2548

Drizzle Trunk: Pending requested 2012-05-11

Diff: 28 lines (+2/-3)

2 files modified

libdrizzle/conn.cc (+1/-2)
plugin/gearman_udf/function_map.cc (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #879027: libdrizzle: failed non-blocking connects do not report error

Low

In Progress

Link a bug report

Related blueprints

2548. By Brian Aker on 2012-05-11

Fix for calling current Gearman function, another for bad init of error variable, and finally a spurious return call.

2547. By Drizzle Continuous Integration on 2012-05-02

pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-05-02 bzr set-root-id

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

modified:
  plugin/rabbitmq/rabbitmq_log.cc

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

modified:
  drizzled/drizzled.cc
  drizzled/execute/scanner.l
pending merge tips: (use -v to see all merge revisions)
  Andrew Hutchings 2012-04-21 Merge in both of Andrew's patchs for 7.1

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

added:
  tests/suite/regression/r/986455.result
  tests/suite/regression/t/986455.test
modified:
  .bzrignore
  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
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-20 Fix for lp:986455

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

modified:
  libdrizzle-1.0/t/drizzle_con_st.c
  libdrizzle/conn.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-19 Clean up error messages on libdrizzle

2542. By Drizzle Continuous Integration on 2012-04-18

modified:
  drizzled/drizzled.cc
  plugin/mysql_unix_socket_protocol/protocol.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-17 Add atexit() call to make sure that we clean up the socket file.

2541. By Drizzle Continuous Integration on 2012-04-18

modified:
  plugin/slave/queue_producer.cc
pending merge tips: (use -v to see all merge revisions)
  Stewart Smith 2012-04-14 improve messages from slave io thread to better indicate what is going on at any one time.

2540. By Drizzle Continuous Integration on 2012-04-17

modified:
  libdrizzle/conn.cc
pending merge tips: (use -v to see all merge revisions)
  Brian Aker 2012-04-16 If you try to connect while Drizzle is starting up, the connection will bever happen.

2539. By Drizzle Continuous Integration on 2012-04-16

Merge and fix configure.ac conflict.