List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:November 21 2006 6:43pm
Subject:bk commit into 5.1 tree (anozdrin:1.2377)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of alik. When alik does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-21 21:43:24+03:00, anozdrin@booka. +1 -0
  Short fix for Windows.

  server-tools/instance-manager/manager.cc@stripped, 2006-11-21 21:43:21+03:00, anozdrin@booka. +2 -0
    Make it compilable on Windows.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	anozdrin
# Host:	booka.
# Root:	/home/alik/MySQL/devel/5.1-rt-im

--- 1.43/server-tools/instance-manager/manager.cc	2006-11-21 21:43:30 +03:00
+++ 1.44/server-tools/instance-manager/manager.cc	2006-11-21 21:43:30 +03:00
@@ -183,6 +183,7 @@ int Manager::main()
   bool shutdown_complete= FALSE;
   pid_t manager_pid= getpid();
 
+#ifndef __WIN__
   if (check_if_linux_threads(&linux_threads))
   {
     log_error("Can not determine thread model.");
@@ -191,6 +192,7 @@ int Manager::main()
 
   log_info("Detected threads model: %s.",
            (const char *) (linux_threads ? "LINUX threads" : "POSIX threads"));
+#endif // __WIN__
 
   Thread_registry thread_registry;
   /*
Thread
bk commit into 5.1 tree (anozdrin:1.2377)Alexander Nozdrin21 Nov