summaryrefslogtreecommitdiff
path: root/sql-common
diff options
context:
space:
mode:
authorunknown <Reggie/Reggie@xp.>2007-06-07 09:13:56 -0500
committerunknown <Reggie/Reggie@xp.>2007-06-07 09:13:56 -0500
commit33525fd3d53343e02cc0906017a33ad33bbb1283 (patch)
tree25a7607472746d1a0b68ba61e942b4fa458979c3 /sql-common
parentc98d6e5b5ba8010cac6e9adb162ec88de2537163 (diff)
downloadmariadb-git-33525fd3d53343e02cc0906017a33ad33bbb1283.tar.gz
Bug #24731 Shared memory connections do not work with MySql ran as service on Vista
The events were not being opened in the global namespace. sql-common/client.c: Add Global\\ to the event names so they are opened in the global namespace
Diffstat (limited to 'sql-common')
-rw-r--r--sql-common/client.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql-common/client.c b/sql-common/client.c
index 40512da0492..3e5ceb1a738 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -416,7 +416,7 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout)
shared_memory_base_name is unique value for each server
unique_part is uniquel value for each object (events and file-mapping)
*/
- suffix_pos = strxmov(tmp,shared_memory_base_name,"_",NullS);
+ suffix_pos = strxmov(tmp, "Global\\", shared_memory_base_name, "_", NullS);
strmov(suffix_pos, "CONNECT_REQUEST");
if (!(event_connect_request= OpenEvent(event_access_rights, FALSE, tmp)))
{
@@ -470,8 +470,8 @@ HANDLE create_shared_memory(MYSQL *mysql,NET *net, uint connect_timeout)
unique_part is uniquel value for each object (events and file-mapping)
number_of_connection is number of connection between server and client
*/
- suffix_pos = strxmov(tmp,shared_memory_base_name,"_",connect_number_char,
- "_",NullS);
+ suffix_pos = strxmov(tmp, "Global\\", shared_memory_base_name, "_", connect_number_char,
+ "_", NullS);
strmov(suffix_pos, "DATA");
if ((handle_file_map = OpenFileMapping(FILE_MAP_WRITE,FALSE,tmp)) == NULL)
{