mariadb/server-tools/instance-manager
unknown c3c5f8d6d7 Merge mysql.com:/home/jimw/my/mysql-5.0-clean
into  mysql.com:/home/jimw/my/mysql-5.1-clean


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
  Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
  Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
  Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysql.sln:
  Auto merged
VC++Files/mysql_ia64.dsw:
  Auto merged
client/mysql.cc:
  Auto merged
config/ac-macros/zlib.m4:
  Auto merged
configure.in:
  Auto merged
extra/yassl/Makefile.am:
  Auto merged
extra/yassl/taocrypt/Makefile.am:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
libmysql/libmysql.def:
  Auto merged
libmysqld/libmysqld.def:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/r/trigger.result:
  Auto merged
mysql-test/r/udf.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/rpl_rotate_logs.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
mysql-test/t/trigger.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_subselect.cc:
  Auto merged
sql-common/client.c:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
client/Makefile.am:
  Resolve conflict
config/ac-macros/yassl.m4:
  Resolve conflict
mysql-test/include/have_udf.inc:
  Resolve conflict
mysql-test/lib/mtr_process.pl:
  Resolve conflict
mysql-test/mysql-test-run.pl:
  Resolve conflict
mysql-test/r/have_udf.require:
  Resolve conflict
mysql-test/r/rpl_openssl.result:
  Resolve conflict
mysql-test/t/disabled.def:
  Resolve conflict
mysql-test/t/information_schema.test:
  Resolve conflict
server-tools/instance-manager/instance_options.cc:
  Resolve conflict
sql/mysql_priv.h:
  Resolve conflict
sql/set_var.cc:
  Resolve conflict
support-files/mysql.spec.sh:
  Resolve conflict
2006-04-30 13:27:38 -07:00
..
buffer.cc Some minor fixes revealed as warnings by 2005-09-23 21:28:56 +03:00
buffer.h Some minor fixes revealed as warnings by 2005-09-23 21:28:56 +03:00
cmakelists.txt Fix Windows CMake compilation after merge of Magnuses ssl patch. 2006-03-16 16:57:24 +01:00
command.cc Some minor fixes revealed as warnings by 2005-09-23 21:28:56 +03:00
command.h fix compilation failure on serg's box: we shouldn't 2005-10-19 00:31:00 +04:00
commands.cc Merge mysql.com:/home/cps/mysql/devel/5.0-mike 2006-02-10 21:03:49 +03:00
commands.h Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads and alters one config file only." 2005-07-21 22:40:53 +04:00
guardian.cc Remove unused variables and label 2006-04-10 18:34:18 +02:00
guardian.h pthread_handler_decl() changed to be ctags-friendly 2005-10-08 16:39:55 +02:00
IMService.cpp fixed the service bits of the IM 2005-09-13 14:53:19 -05:00
IMService.h fixed the service bits of the IM 2005-09-13 14:53:19 -05:00
instance.cc a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
instance.h Some minor fixes revealed as warnings by 2005-09-23 21:28:56 +03:00
instance_map.cc Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0 2006-02-21 15:59:41 +03:00
instance_map.h Fix race condition: instance map wasn't locked for the 2006-02-21 15:57:56 +03:00
instance_options.cc Merge mysql.com:/home/jimw/my/mysql-5.0-clean 2006-04-30 13:27:38 -07:00
instance_options.h Bug#19362 im_daemon_lifecycle fails when built from source distribution 2006-04-26 12:45:22 +02:00
listener.cc relying on loop counter variables being local to the loop body if 2006-03-14 11:13:41 +01:00
listener.h fix compilation failure on serg's box: we shouldn't 2005-10-19 00:31:00 +04:00
log.cc New "Instance Manager" code: 2005-08-05 20:44:52 +02:00
log.h Various fixes (cleanups, valgrind, makefiles, ...) 2005-02-03 20:48:58 +03:00
Makefile.am Some changes to make it possible to build for Windows with CMake from 2006-03-24 22:50:56 +01:00
manager.cc Fix race condition: instance map wasn't locked for the 2006-02-21 15:57:56 +03:00
manager.h initial import of Windows port of IM. 2005-07-20 10:55:40 -05:00
messages.cc post-review fixes 2005-05-16 01:54:02 +04:00
messages.h Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it should be 2005-03-22 02:04:14 +03:00
mysql_connection.cc Remove unused variables and label 2006-04-10 18:34:18 +02:00
mysql_connection.h fix compilation failure on serg's box: we shouldn't 2005-10-19 00:31:00 +04:00
mysql_manager_error.h post-review fixes 2005-05-16 01:54:02 +04:00
mysqlmanager.cc a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
mysqlmanager.vcproj some last minute Windows compile fixes and makefile corrections 2005-09-15 14:32:01 -05:00
options.cc Merge bk-internal:/home/bk/mysql-5.1-new 2006-04-12 13:01:26 -07:00
options.h Support --debug/-# in instance manager. 2006-04-12 11:14:56 -07:00
parse.cc Add a shift in the parser. Forgotten in the previous commit. 2006-02-18 03:22:13 +03:00
parse.h Cleanup the instance manager code. 2005-08-29 23:29:35 +04:00
parse_output.cc Bug #19059: Failure to get version information when running from source tree 2006-04-17 09:38:50 -07:00
parse_output.h several fixes to the previous patch 2005-06-07 17:57:20 +04:00
portability.h a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
priv.cc a bunch of IM fixes from the GUI team 2006-02-10 02:15:55 +03:00
priv.h Fix for Bug #12674 "Instance Manager: IM doesn't handle client 2006-02-21 15:32:52 +03:00
protocol.cc Some fixes including implicit declaration of a function, 2005-10-04 18:20:57 +03:00
protocol.h rename: store_to_string -> store_to_protocol_packet 2005-06-15 01:06:25 +04:00
README First implementation of instance-manager carcass: 2003-08-16 21:44:24 +04:00
thread_registry.cc fix compilation failure on serg's box: we shouldn't 2005-10-19 00:31:00 +04:00
thread_registry.h fix compilation failure on serg's box: we shouldn't 2005-10-19 00:31:00 +04:00
user_map.cc fix compile failure (which shows up in cygwin environment) 2005-10-07 20:25:51 +04:00
user_map.h fix compilation failure on serg's box: we shouldn't 2005-10-19 00:31:00 +04:00
WindowsService.cpp fixed the service bits of the IM 2005-09-13 14:53:19 -05:00
WindowsService.h fixed the service bits of the IM 2005-09-13 14:53:19 -05:00

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.