Drizzle

Merge lp:~tobi-coldtobi/drizzle/trunk-bug-925904 into lp:drizzle

  1. trunk-bug-925904
  2. Merge into 7.2
Proposed by coldtobi
Status: Merged
Approved by: Brian Aker
Approved revision: 2581
Merged at revision: 2585
Proposed branch: lp:~tobi-coldtobi/drizzle/trunk-bug-925904
Merge into: lp:drizzle
Diff against target: 20 lines (+4/-0)
1 file modified
plugin/mysql_unix_socket_protocol/protocol.cc (+4/-0)
To merge this branch: bzr merge lp:~tobi-coldtobi/drizzle/trunk-bug-925904
Reviewer Review Type Date Requested Status
Drizzle Trunk Pending
Review via email: mp+120295@code.launchpad.net

Description of the change

See LP-Bug 925904 for details.
(This patch is applied in Debian.)

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/mysql_unix_socket_protocol/protocol.cc'
2--- plugin/mysql_unix_socket_protocol/protocol.cc 2012-04-17 08:44:17 +0000
3+++ plugin/mysql_unix_socket_protocol/protocol.cc 2012-08-19 13:15:37 +0000
4@@ -31,6 +31,8 @@
5 #include <boost/filesystem.hpp>
6 #include <drizzled/module/option_map.h>
7
8+#include <sys/stat.h>
9+
10 #include <sys/un.h>
11
12 #include <plugin/mysql_unix_socket_protocol/protocol.h>
13@@ -161,6 +163,8 @@
14
15 fds.push_back(unix_sock);
16
17+ chmod(_unix_socket_path.file_string().c_str(),0777);
18+
19 return false;
20 }
21

Subscribers

People subscribed via source and target branches

to all changes: