mariadb/server-tools/instance-manager
unknown 167aaaa5a4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.1


mysql-test/r/func_time.result:
  Auto merged
mysql-test/r/grant.result:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/grant.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/mysql_client_test.test:
  Auto merged
server-tools/instance-manager/listener.cc:
  Auto merged
server-tools/instance-manager/portability.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
client/mysql.cc:
  Manual merge.
mysql-test/mysql-test-run.pl:
  Manual merge.
2006-08-21 12:59:46 -04:00
..
buffer.cc
buffer.h
CMakeLists.txt
command.cc
command.h
commands.cc
commands.h
exit_codes.h
guardian.cc
guardian.h
IMService.cpp
IMService.h
instance.cc A couple of adjustments to the merge to fix the broken build 2006-08-17 22:24:35 +02:00
instance.h
instance_map.cc
instance_map.h
instance_options.cc Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2 2006-06-23 15:05:15 +02:00
instance_options.h
listener.cc relying on loop counter variables being local to the loop body if 2006-08-05 13:41:22 +02:00
listener.h
log.cc
log.h
Makefile.am
manager.cc
manager.h
messages.cc Merge bk-internal.mysql.com:/data0/bk/tmp_reg 2006-08-17 17:19:41 +02:00
messages.h
mysql_connection.cc
mysql_connection.h
mysql_manager_error.h
mysqlmanager.cc
mysqlmanager.vcproj mysqlmanager.vcproj: 2006-07-22 02:00:33 +02:00
options.cc
options.h
parse.cc
parse.h Fixes for Windows compilation failures. 2006-07-07 16:14:07 +04:00
parse_output.cc
parse_output.h
portability.h Merge zippy.cornsilk.net:/home/cmiller/work/mysql/merge/mysql-5.0 2006-08-21 12:59:46 -04:00
priv.cc
priv.h
protocol.cc
protocol.h
README
thread_registry.cc
thread_registry.h
user_management_commands.cc
user_management_commands.h
user_map.cc
user_map.h
WindowsService.cpp
WindowsService.h

Instance Manager - manage MySQL instances locally and remotely.

File description:
 mysqlmanager.cc - entry point to the manager, main, 
 options.{h,cc} - handle startup options
 manager.{h,cc} - manager process
 mysql_connection.{h,cc} - handle one connection with mysql client.

See also instance manager architecture description in mysqlmanager.cc.