Fix for compiling against current libdrizzle.

libgearman-server/plugins/protocol/http/protocol.cc

@@ -214,13 +214,13 @@ public:
                                     "HTTP/1.0 200 OK\r\n"
                                     "X-Gearman-Job-Handle: %.*s\r\n"
                                     "X-Gearman-Command: %s\r\n"
-                                    "Content-Length: %" PRIu64 "\r\n"
+                                    "Content-Length: %d\r\n"
                                     "Server: Gearman/" PACKAGE_VERSION "\r\n"
                                     "\r\n%.*s",
                                     packet->command == GEARMAN_COMMAND_JOB_CREATED ?  int(packet->arg_size[0]) : int(packet->arg_size[0] - 1),
-                                    (const char *)packet->arg[0],
+                                    (const char *)packet->arg[0], // Job handle
                                     gearman_strcommand(packet->command),
-                                    uint64_t(content.size()),
+                                    int(content.size()), // Content-length
                                     int(content.size()), &content[0]);
       }
       else

libgearman-server/plugins/queue/drizzle/queue.cc

@@ -365,26 +365,26 @@ gearmand_error_t gearman_server_queue_libdrizzle_init(plugins::queue::Drizzle *q
 
   if (queue->uds.empty())
   {
-    queue->drizzle= drizzle_create_tcp(queue->host.c_str(), queue->port,
-                                       queue->user.c_str(), queue->password.c_str(),
-                                       "INFORMATION_SCHEMA",
-                                       drizzle_options_t());
-    queue->insert_con= drizzle_create_tcp(queue->host.c_str(), queue->port,
-                                          queue->user.c_str(), queue->password.c_str(),
-                                          "INFORMATION_SCHEMA",
-                                          drizzle_options_t());
+    queue->drizzle= drizzle_create(queue->host.c_str(), queue->port,
+                                   queue->user.c_str(), queue->password.c_str(),
+                                   "INFORMATION_SCHEMA",
+                                   0);
+    queue->insert_con= drizzle_create(queue->host.c_str(), queue->port,
+                                      queue->user.c_str(), queue->password.c_str(),
+                                      "INFORMATION_SCHEMA",
+                                      0);
 
   }
   else
   {
-    queue->drizzle= drizzle_create_uds(queue->uds.c_str(),
-                                       queue->user.c_str(), queue->password.c_str(),
-                                       "INFORMATION_SCHEMA",
-                                       drizzle_options_t());
-    queue->insert_con= drizzle_create_uds(queue->uds.c_str(),
-                                          queue->user.c_str(), queue->password.c_str(),
-                                          "INFORMATION_SCHEMA",
-                                          drizzle_options_t());
+    queue->drizzle= drizzle_create(queue->uds.c_str(), 0,
+                                   queue->user.c_str(), queue->password.c_str(),
+                                   "INFORMATION_SCHEMA",
+                                   0);
+    queue->insert_con= drizzle_create(queue->uds.c_str(), 0,
+                                      queue->user.c_str(), queue->password.c_str(),
+                                      "INFORMATION_SCHEMA",
+                                      0);
   }
 
   gearmand_log_debug(GEARMAN_DEFAULT_LOG_PARAM, "Using '%s' as the username", queue->user.c_str());

libtest/drizzled.cc

@@ -74,11 +74,11 @@ bool ping_drizzled(const in_port_t _port)
 #if defined(HAVE_LIBDRIZZLE) && HAVE_LIBDRIZZLE
   if (HAVE_LIBDRIZZLE)
   {
-    drizzle_st *drizzle= drizzle_create_tcp(getenv("MYSQL_SERVER"),
-                                            getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
-                                            getenv("MYSQL_USER"),
-                                            getenv("MYSQL_PASSWORD"),
-                                            getenv("MYSQL_SCHEMA"), drizzle_options_t());
+    drizzle_st *drizzle= drizzle_create(getenv("MYSQL_SERVER"),
+                                        getenv("MYSQL_PORT") ? atoi("MYSQL_PORT") : DRIZZLE_DEFAULT_TCP_PORT,
+                                        getenv("MYSQL_USER"),
+                                        getenv("MYSQL_PASSWORD"),
+                                        getenv("MYSQL_SCHEMA"), 0);
 
     if (drizzle == NULL)
     {