Drizzle

1	=== modified file 'libdrizzle/conn.cc'
2	--- libdrizzle/conn.cc 2012-04-20 20:26:15 +0000
3	+++ libdrizzle/conn.cc 2012-05-11 04:04:23 +0000
4	@@ -1422,11 +1422,10 @@
5
6	while (1)
7	{
8	- int error;
9	+ int error= 0;
10	if (con->revents & POLLOUT)
11	{
12	drizzle_state_pop(con);
13	- return DRIZZLE_RETURN_OK;
14	socklen_t error_length= sizeof(error);
15	int getsockopt_error;
16	if ((getsockopt_error= getsockopt(con->fd, SOL_SOCKET, SO_ERROR, (void*)&error, &error_length)) < 1)
17
18	=== modified file 'plugin/gearman_udf/function_map.cc'
19	--- plugin/gearman_udf/function_map.cc 2010-12-18 04:43:40 +0000
20	+++ plugin/gearman_udf/function_map.cc 2012-05-11 04:04:23 +0000
21	@@ -14,7 +14,7 @@
22	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
23
24	#include "function_map.h"
25	-#include <libgearman/client.h>
26	+#include <libgearman-1.0/client.h>
27	#include <string.h>
28	#include <stdlib.h>
29

Merge lp:~brianaker/drizzle/libdrizzle-fix into lp:drizzle/7.1