Drizzle

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

  1. gearman-fix
  2. Merge into 7.1
Proposed by Brian Aker
Status: Merged
Approved by: Brian Aker
Approved revision: 2549
Merged at revision: 2549
Proposed branch: lp:~brianaker/drizzle/gearman-fix
Merge into: lp:drizzle/7.1
Diff against target: 88 lines (+19/-11)
4 files modified
plugin/gearman_udf/function_map.cc (+13/-5)
plugin/gearman_udf/gearman_udf.cc (+2/-2)
plugin/gearman_udf/gman_do.cc (+2/-2)
plugin/gearman_udf/gman_servers_set.cc (+2/-2)
To merge this branch: bzr merge lp:~brianaker/drizzle/gearman-fix
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+106705@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugin/gearman_udf/function_map.cc'
2--- plugin/gearman_udf/function_map.cc 2012-05-11 03:55:14 +0000
3+++ plugin/gearman_udf/function_map.cc 2012-05-21 20:49:18 +0000
4@@ -13,10 +13,13 @@
5 along with this program; if not, write to the Free Software
6 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
7
8-#include "function_map.h"
9-#include <libgearman-1.0/client.h>
10-#include <string.h>
11-#include <stdlib.h>
12+#include <config.h>
13+
14+#include "plugin/gearman_udf/function_map.h"
15+
16+#include <libgearman/gearman.h>
17+#include <cstring>
18+#include <cstdlib>
19
20 using namespace std;
21
22@@ -64,7 +67,9 @@
23 ret= gearman_client_add_servers(&(functionMap[function]), servers.c_str());
24 pthread_mutex_unlock(&lock);
25 if (ret != GEARMAN_SUCCESS)
26+ {
27 return false;
28+ }
29
30 return true;
31 }
32@@ -73,7 +78,10 @@
33 {
34 map<string, gearman_client_st>::iterator x;
35
36- pthread_mutex_lock(&lock);
37+ if (pthread_mutex_lock(&lock) != 0)
38+ {
39+ return false;
40+ }
41
42 x= functionMap.find(function);
43 if (x == functionMap.end())
44
45=== modified file 'plugin/gearman_udf/gearman_udf.cc'
46--- plugin/gearman_udf/gearman_udf.cc 2012-01-15 20:54:59 +0000
47+++ plugin/gearman_udf/gearman_udf.cc 2012-05-21 20:49:18 +0000
48@@ -16,8 +16,8 @@
49 #include <config.h>
50 #include <drizzled/plugin/function.h>
51
52-#include "gman_servers_set.h"
53-#include "gman_do.h"
54+#include "plugin/gearman_udf/gman_servers_set.h"
55+#include "plugin/gearman_udf/gman_do.h"
56
57 using namespace std;
58 using namespace drizzled;
59
60=== modified file 'plugin/gearman_udf/gman_do.cc'
61--- plugin/gearman_udf/gman_do.cc 2011-02-17 00:14:13 +0000
62+++ plugin/gearman_udf/gman_do.cc 2012-05-21 20:49:18 +0000
63@@ -14,8 +14,8 @@
64 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
65
66 #include <config.h>
67-#include "gman_do.h"
68-#include "function_map.h"
69+#include "plugin/gearman_udf/gman_do.h"
70+#include "plugin/gearman_udf/function_map.h"
71
72 using namespace std;
73 using namespace drizzled;
74
75=== modified file 'plugin/gearman_udf/gman_servers_set.cc'
76--- plugin/gearman_udf/gman_servers_set.cc 2011-02-17 00:14:13 +0000
77+++ plugin/gearman_udf/gman_servers_set.cc 2012-05-21 20:49:18 +0000
78@@ -14,8 +14,8 @@
79 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */
80
81 #include <config.h>
82-#include "gman_servers_set.h"
83-#include "function_map.h"
84+#include "plugin/gearman_udf/gman_servers_set.h"
85+#include "plugin/gearman_udf/function_map.h"
86
87 using namespace std;
88 using namespace drizzled;

Subscribers

People subscribed via source and target branches

to all changes: