From: Date: December 4 2007 3:22pm
Subject: bk commit into 6.0 tree (anozdrin:1.2737) BUG#31954
List-Archive: http://lists.mysql.com/commits/39206
X-Bug: 31954
Message-Id: <20071204142259.10C1916472C@station.opbmk>

Below is the list of changes that have just been committed into a local
6.0 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, 2007-12-04 17:22:53+03:00, anozdrin@station. +2 -0
  Additional patch for Bug#31954: Remove undocumented
  mysql_manager_* C API functions and mysqlmanager (old).
  
  manager.c should be also removed from Windows build.

  include/mysql_com.h@stripped, 2007-12-04 17:22:50+03:00, anozdrin@station. +0 -4
    Remove outdated comment.

  libmysql/CMakeLists.txt@stripped, 2007-12-04 17:22:50+03:00, anozdrin@station. +1 -1
    Remove manager.c from Windows build.

diff -Nrup a/include/mysql_com.h b/include/mysql_com.h
--- a/include/mysql_com.h	2007-11-28 00:16:54 +03:00
+++ b/include/mysql_com.h	2007-12-04 17:22:50 +03:00
@@ -369,10 +369,6 @@ void my_net_set_write_timeout(NET *net, 
 void my_net_set_read_timeout(NET *net, uint timeout);
 #endif
 
-/*
-  The following function is not meant for normal usage
-  Currently it's used internally by manager.c
-*/
 struct sockaddr;
 int my_connect(my_socket s, const struct sockaddr *name, unsigned int namelen,
 	       unsigned int timeout);
diff -Nrup a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
--- a/libmysql/CMakeLists.txt	2007-11-10 04:28:26 +03:00
+++ b/libmysql/CMakeLists.txt	2007-12-04 17:22:50 +03:00
@@ -75,7 +75,7 @@ SET(CLIENT_SOURCES   ../mysys/array.c ..
                      ../mysys/hash.c ../mysys/my_sleep.c ../mysys/default_modify.c
                      get_password.c ../strings/int2str.c ../strings/is_prefix.c 
                      libmysql.c ../mysys/list.c ../strings/llstr.c
-                     ../strings/longlong2str.c manager.c ../mysys/mf_arr_appstr.c ../mysys/mf_cache.c
+                     ../strings/longlong2str.c ../mysys/mf_arr_appstr.c ../mysys/mf_cache.c
                      ../mysys/mf_dirname.c ../mysys/mf_fn_ext.c ../mysys/mf_format.c 
                      ../mysys/mf_iocache.c ../mysys/mf_iocache2.c ../mysys/mf_loadpath.c 
                      ../mysys/mf_pack.c ../mysys/mf_path.c ../mysys/mf_tempfile.c ../mysys/mf_unixpath.c