Commit graph

24 commits

Author SHA1 Message Date
unknown
832a2b27fb fix for compilation problem with --with-openssl reported by Guilhem
server-tools/instance-manager/Makefile.am:
  fix for compilation problem with --with-openssl
2005-05-18 16:05:58 +04:00
unknown
d67f4397dc Enable IM in the binary distribution and fix Bug #9513 (mysql.server script from the binary distibution
doesn't work out of the box)


client/Makefile.am:
  old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into mysqltestmanager, mysqltestmanagerc and
  mysqltestmanager-pwgen respectively
mysql-test/mysql-test-run.sh:
  Old mysqlmanager, mysqlmanagerc and mysqlmanager-pwgen renamed into
  mysqltestmanager, mysqltestmanagerc and mysqltestmanager-pwgen respectively
scripts/make_binary_distribution.sh:
  Fix the script to include IM and process mysql.server correctly
server-tools/instance-manager/Makefile.am:
  change default socket name to follow mysqld style (and thus, fix the ptoblem with non-existant localstatedir
  in the binary distribution)
support-files/mysql.spec.sh:
  Fix mysql.spec template to reflect the name change
tools/Makefile.am:
  old mysqlmanager renamed into mysqltestmanager
2005-04-04 03:49:10 +04:00
unknown
6990e80de8 fix to avoid relinking on each "make"
server-tools/instance-manager/Makefile.am:
  "Makefile" target removed
2005-03-02 23:16:32 +03:00
unknown
4ce6711a14 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review


include/my_sys.h:
  Auto merged
server-tools/instance-manager/Makefile.am:
  Auto merged
2005-02-20 23:01:07 +03:00
unknown
da4604f9e8 CPPFLAGS is substituted with CXXFLAGS to work with older automake. Serg, now you can enable
server-tools/instance-manager.


server-tools/instance-manager/Makefile.am:
  The famous CPPFLAGS (aka "upgrade automake") thing was removed. Upon Brian's request.
2005-02-20 04:36:22 +03:00
unknown
97f26ff5f6 new variant of passwd() by S. Vojtovich
server-tools/instance-manager/Makefile.am:
  link get_password() to the IM
server-tools/instance-manager/options.cc:
  make passwd() function to read password in mysqladmin way
2005-02-18 15:23:55 +03:00
unknown
83cce1caa4 Merge mysql.com:/home/cps/mysql/trees/mysql-5.0
into mysql.com:/home/cps/mysql/devel/im-fix-review


server-tools/instance-manager/Makefile.am:
  Auto merged
support-files/Makefile.am:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2005-02-15 17:34:26 +03:00
unknown
dce2554f91 Post-review fixes + some bugs fixed + several minor features
BitKeeper/deleted/.del-client_func.c~3476a8a85cbd3c29:
  Delete: server-tools/instance-manager/client_func.c
server-tools/instance-manager/Makefile.am:
  clien_func removed
server-tools/instance-manager/buffer.cc:
  several methods added
server-tools/instance-manager/buffer.h:
  Some error-handling fixes.
server-tools/instance-manager/commands.cc:
  check for Buffer errors
server-tools/instance-manager/guardian.cc:
  Guardian rewiriten. Not it works in a finite state machine-way.
server-tools/instance-manager/guardian.h:
  Appropriate (to .cc) changes in the header + some comment added
server-tools/instance-manager/instance.cc:
  added proxy thread to monitor instance. Two kinds of stop() now -- stop() and kill_instance which
  only sends a signal
server-tools/instance-manager/instance.h:
  appropriate changes
server-tools/instance-manager/instance_map.cc:
  cleanup
server-tools/instance-manager/instance_map.h:
  cleanup
server-tools/instance-manager/instance_options.cc:
  Caching of the pid-file-name is added. some comments added
server-tools/instance-manager/instance_options.h:
  cleanup
server-tools/instance-manager/listener.cc:
  listener my_thread_init added (though it doesn't use any mysys functions). Just in case
server-tools/instance-manager/manager.cc:
  SIGCHLD handler removed. now instance monitoring is implemented through proxy threads. This is to work nicely
  with LinuxThreads
server-tools/instance-manager/options.cc:
  added option to create a password file entry (this was implemented by Sergei Vojtovich)
server-tools/instance-manager/parse.cc:
  inline function get_word moved to the header
server-tools/instance-manager/parse.h:
  get_word moved here to use form parse_output
server-tools/instance-manager/parse_output.cc:
  get_word() clone removed. now looking through the output linewise
server-tools/instance-manager/protocol.cc:
  Buffer error chech added
server-tools/instance-manager/user_map.cc:
  typo fixed
2005-02-11 14:21:59 +03:00
unknown
87e104e441 Fixed setup scripts to use mysqlmanager instead of mysqld_safe
server-tools/instance-manager/Makefile.am:
  obsolete defaults removed. Also changed default binary  placement. Now mysqlmanager should be installed in
  libexecdir (usually /usr/sbin)
server-tools/instance-manager/instance_options.cc:
  bug, resulted in skipping non-sepcially recognized mysqld options fixed
server-tools/instance-manager/user_map.cc:
  log message made a bit more verbose
support-files/mysql.server.sh:
  use mysqlmanager tp start mysqld
support-files/mysql.spec.sh:
  mysqlmanager should be placed in /usr/bin
2005-02-05 10:15:34 +03:00
unknown
ab432d6c05 Various fixes (cleanups, valgrind, makefiles, ...)
server-tools/instance-manager/Makefile.am:
  increased default_monitoring interval
server-tools/instance-manager/guardian.cc:
  some fixes for proper shutdown
server-tools/instance-manager/guardian.h:
  removed init() prototype, as it was never used
server-tools/instance-manager/instance.cc:
  cleanup() function removed
server-tools/instance-manager/instance.h:
  cleanup() prototype removed
server-tools/instance-manager/instance_map.cc:
  Instance_map::cleanup() removed, as instances have nothing to clean up
server-tools/instance-manager/instance_map.h:
  Instance_map::cleanup() prototype removed
server-tools/instance-manager/instance_options.cc:
  added print_argv() function for debug purposes
server-tools/instance-manager/instance_options.h:
  declared print_argv()
server-tools/instance-manager/listener.cc:
  some fixed in listener for proper shutdown
server-tools/instance-manager/log.cc:
  cleanup
server-tools/instance-manager/log.h:
  cleanup
server-tools/instance-manager/manager.cc:
  some comments added
server-tools/instance-manager/mysqlmanager.cc:
  we need to free memory in the very end
server-tools/instance-manager/options.cc:
  fixed default options handling (as they were not working properly), added new method to cleanup Options
server-tools/instance-manager/options.h:
  cleanup() declared
server-tools/instance-manager/thread_registry.cc:
  cleanup
server-tools/instance-manager/user_map.cc:
  missing password file is not a critical error anymore, as IM should be able to work as mysqld_safe only
2005-02-03 20:48:58 +03:00
unknown
5c3c40798d small Makefile.am cleanup
clean: targets removed
    generated *.h files moved to include/


Docs/Images/Makefile.am:
  no clean: targets please!
client/Makefile.am:
  generated *.h files moved to include/
extra/Makefile.am:
  generated *.h files moved to include/
include/Makefile.am:
  no clean: targets please!
libmysql/Makefile.am:
  generated *.h files moved to include/
libmysql_r/Makefile.am:
  generated *.h files moved to include/
libmysqld/Makefile.am:
  generated *.h files moved to include/
libmysqld/examples/Makefile.am:
  generated *.h files moved to include/
  no clean: target please!
ndb/docs/Makefile.am:
  no clean: targets please!
scripts/Makefile.am:
  SUPERCLEANFILES means nothing
server-tools/instance-manager/Makefile.am:
  generated *.h files moved to include/
sql/Makefile.am:
  generated *.h files moved to include/
sql/share/Makefile.am:
  instead of (incorrectly) duplicating comp_err command line,
  call do make in extra/
tools/Makefile.am:
  generated *.h files moved to include/
BitKeeper/etc/ignore:
  Added include/mysqld_ername.h include/mysqld_error.h include/sql_state.h to the ignore list
2005-01-28 17:14:03 +01:00
unknown
fb3d6c39a0 IM mostly fixed according to Brian's directions. Will need to do some additional option handling and cleanups
server-tools/instance-manager/Makefile.am:
  New file added
server-tools/instance-manager/client_func.c:
  typo fixed
server-tools/instance-manager/commands.cc:
  there are no admin-user snd admin-password fields anymore, so no need to show their values
server-tools/instance-manager/guardian.cc:
  Syncronization added -- now guardian wakes up whenever SIGCLD has been catched
server-tools/instance-manager/guardian.h:
  Condition variable declared
server-tools/instance-manager/instance.cc:
  Persistent connection to the instance removed. Now we use SIGTERM instead of com_shutdown for STOP. We also
  manage SIGCHLD ourselves now (therefore no double fork).
server-tools/instance-manager/instance.h:
  Pointer to the instance_map added, MySQL connection structures removed
server-tools/instance-manager/instance_map.cc:
  More syncronization added (to make proper STOP)
server-tools/instance-manager/instance_map.h:
  added condition variable and mutex for connection threads to wait for SIGCHLD
server-tools/instance-manager/instance_options.cc:
  defaults-handling methods have been added.
server-tools/instance-manager/instance_options.h:
  New functions and constants declared
server-tools/instance-manager/listener.cc:
  No changes here (bk bug?)
server-tools/instance-manager/manager.cc:
  SIGCHLD handling added
2005-01-25 13:54:56 +03:00
unknown
1a1974544d Set default port to the one assigned by IANA 2004-12-23 20:47:03 +03:00
unknown
87275b2866 WL#1051, more maintanable error messages.
BitKeeper/deleted/.del-mysqld_error.h~9dac75782467aab7:
  Delete: include/mysqld_error.h
BitKeeper/deleted/.del-sql_state.h~4307ea5f1fe99019:
  Delete: include/sql_state.h
BitKeeper/deleted/.del-errmsg.txt~ba132dc9bc936c8a:
  Delete: sql/share/czech/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Delete: sql/share/danish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ef28b592c7591b7:
  Delete: sql/share/dutch/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~11edc4db89248c16:
  Delete: sql/share/french/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~184eb1f09242dc72:
  Delete: sql/share/estonian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~898865062c970766:
  Delete: sql/share/greek/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~94a93cc742fca24d:
  Delete: sql/share/german/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
  Delete: sql/share/english/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~2cdeb8d6f80eba72:
  Delete: sql/share/norwegian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~587903f9311db2d1:
  Delete: sql/share/italian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~9dab24f7fb11b1e1:
  Delete: sql/share/korean/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~e3183b99fbba0a9c:
  Delete: sql/share/japanese/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~eeb2c47537ed9c23:
  Delete: sql/share/hungarian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~606dfaeb9e81aa4e:
  Delete: sql/share/portuguese/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~7397c423c52c6d2c:
  Delete: sql/share/polish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~b6181e29d8282b06:
  Delete: sql/share/norwegian-ny/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~e2609fdf7870795:
  Delete: sql/share/romanian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ef53c33ac0ff8a84:
  Delete: sql/share/russian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Delete: sql/share/serbian/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~6bbd9eac7f0e6b89:
  Delete: sql/share/slovak/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~b44a85a177954da0:
  Delete: sql/share/swedish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~f19bfd5d4c918964:
  Delete: sql/share/spanish/errmsg.txt
BitKeeper/deleted/.del-errmsg.txt~8ed1999cbd481dc4:
  Delete: sql/share/ukrainian/errmsg.txt
client/Makefile.am:
  Added pass to mysqld_error.j and sql_state.h
extra/Makefile.am:
  Added rules to create mysqld_error.h and sql_state.h
extra/comp_err.c:
  WL#1051
include/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
libmysql/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
libmysql_r/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
server-tools/instance-manager/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
sql/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
sql/share/Makefile.am:
  Removed unnecessary loop over all languages; addred rule to creat <lang>.sys files
tools/Makefile.am:
  Added pass to mysqld_error.h and sql_state.h
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-12-13 22:51:54 +02:00
unknown
b5536bb962 Some minor IM fixes
server-tools/instance-manager/Makefile.am:
  Makefile.am cleanup
server-tools/instance-manager/commands.cc:
  cleanup
server-tools/instance-manager/instance_map.cc:
  fix the problem caused thread deadlock (as load ends up in the find()
  call which now also locks an instance map mutex)
server-tools/instance-manager/listener.cc:
  portability fix
server-tools/instance-manager/manager.cc:
  Ignore SIGPIPE
server-tools/instance-manager/mysqlmanager.cc:
  cleanup
server-tools/instance-manager/options.cc:
  options renamed
2004-11-15 14:53:30 +03:00
unknown
0157ffa5fd few more fixes - fix makefile and get rid of strncasecmp in favour of
my_strnncoll


server-tools/instance-manager/Makefile.am:
  one more makefile fix
server-tools/instance-manager/parse.cc:
  get rid of non-portable strnacasecmp
2004-11-06 23:18:28 +03:00
unknown
4f32ec1882 fix for the IM linking problem
BitKeeper/etc/ignore:
  Added mysql-5.0.2-alpha.tar.gz server-tools/instance-manager/client.c server-tools/instance-manager/client_settings.h server-tools/instance-manager/errmsg.c to the ignore list
server-tools/instance-manager/instance_map.cc:
  Comment updated
server-tools/instance-manager/priv.cc:
  added variables needed by net_serv.cc
server-tools/instance-manager/priv.h:
  declared variables needed by net_serv.cc
sql/net_serv.cc:
  added some IM-specific defines
2004-11-06 02:14:56 +03:00
unknown
598bdc38b1 protability fix
server-tools/instance-manager/Makefile.am:
  portability fix
BitKeeper/etc/ignore:
  Added server-tools/instance-manager/thr_alarm.c to the ignore list
2004-11-04 11:24:14 +03:00
unknown
bb63229331 linking problem fix
server-tools/instance-manager/Makefile.am:
  fix that should solve the linking problem (libmysqlclient conflicts
  with libmysys)
server-tools/instance-manager/instance_map.cc:
  propagae phtead_mutex_* functions from the wrapper
2004-11-04 02:42:22 +03:00
unknown
7a3a757fd5 post-review fixes
server-tools/instance-manager/Makefile.am:
  Removed entry for deleted file
server-tools/instance-manager/buffer.cc:
  cleanup
server-tools/instance-manager/commands.cc:
  cleanup, added missing error handling
server-tools/instance-manager/instance.cc:
  added waitpid in instance_start, added few checks
server-tools/instance-manager/instance_map.cc:
  error handling for hash_init added
server-tools/instance-manager/instance_map.h:
  Extended constructor
server-tools/instance-manager/instance_options.cc:
  made add_option less bulky
server-tools/instance-manager/instance_options.h:
  -
server-tools/instance-manager/listener.cc:
  added missing close, fixed typo
server-tools/instance-manager/manager.cc:
  moved some Instance_map initialization to costructor
server-tools/instance-manager/protocol.cc:
  error handling added
server-tools/instance-manager/protocol.h:
  store_to_string fixed to return a value
server-tools/instance-manager/user_map.cc:
  error handling for hash_init added
server-tools/instance-manager/user_map.h:
  added init() for User map (becouse of the hash_init check)
2004-11-02 10:11:03 +03:00
unknown
a5435ea78a Intermediate commit - just to make new files visible to bk in the new
tree


server-tools/instance-manager/Makefile.am:
  Fixed IM linking to avoid using both mysys and libmysql as the define the
  same symbols and therefore conflict
server-tools/instance-manager/listener.cc:
  Added ability to listen network ports
server-tools/instance-manager/listener.h:
  Various additions to the Listener_thread_args
server-tools/instance-manager/log.cc:
  merge
server-tools/instance-manager/log.h:
  merge
server-tools/instance-manager/manager.cc:
  Fixes and additions to enable guardian functionality
server-tools/instance-manager/manager.h:
  Changed manager() signature
server-tools/instance-manager/mysqlmanager.cc:
  Various fixes
server-tools/instance-manager/options.cc:
  Added handling of default values for new options in the Options struct. (such
  as default_user, default_password, monitoring_interval e.t.c)
server-tools/instance-manager/options.h:
  Added new options to the Options struct
sql/net_serv.cc:
  Added MYSQL_INSTANCE_MANAGER defines to enable alarm handling in the IM
server-tools/instance-manager/buffer.cc:
  Simple implementation of variable-length buffer
server-tools/instance-manager/command.cc:
  Abstract command. All commands are derived from Command class
server-tools/instance-manager/commands.h:
  Interfaces for all commands we have
server-tools/instance-manager/factory.cc:
  Commands factory. This class hides command instantiation. The idea is to
  handle various protocols this way. (different commands for different
  protocols
server-tools/instance-manager/guardian.cc:
  Guardian thread implementation (monitor and restart instances in case of a
  failure
server-tools/instance-manager/guardian.h:
  Guardian_thread and Guardian_thread_args class interface. The
  Guardian_thread is responsible for monitoring and restarting instances
server-tools/instance-manager/instance.cc:
  Instance class contains methods and data to manage a single instance
server-tools/instance-manager/instance.h:
  This file contains class an instance class interface. The class is
  responsible for starting/stopping an instance
server-tools/instance-manager/instance_map.cc:
  The instance repository. This class is also responsible for initialization
  of Instance class objects.
server-tools/instance-manager/instance_options.cc:
  The Instance_options class contains all methods to get and  handle options
  of an instance
server-tools/instance-manager/mysql_connection.cc:
  The class responsible for handling MySQL client/server protocol connections
server-tools/instance-manager/mysql_manager_error.h:
  The list of Instance Manger-specific errors
server-tools/instance-manager/parse.cc:
  Simple query parser
server-tools/instance-manager/parse.h:
  Parser interface
server-tools/instance-manager/protocol.cc:
  Here implemented functions used to handle mysql client/server protocol
server-tools/instance-manager/protocol.h:
  Interface for MySQL client/server protocol
server-tools/instance-manager/thread_registry.cc:
  Thread registry stores information about every thread. It's main function is
  to provide graceful shutdown for all threads.
server-tools/instance-manager/user_map.h:
  User map contains hash with user names and passwords
2004-10-23 11:32:52 +04:00
unknown
21b19bd408 fixed typo caused autobuild failure with "make dist"
server-tools/instance-manager/Makefile.am:
  fixed typo
2004-10-12 14:53:32 +04:00
unknown
df6047f047 First implementation for signal handling and multi-threading:
safe shutdown and signal deliverence to all threads in 
the manager process


server-tools/instance-manager/Makefile.am:
  added listener.{h,cc} (listener thread)
  and thread_repository.{h,cc} - 
  class to handle threads && signals
server-tools/instance-manager/log.h:
  minor fixes
server-tools/instance-manager/manager.cc:
  unnecessary error checking was removed 
  added implementation for signal thread
server-tools/instance-manager/manager.h:
  header guards're added
server-tools/instance-manager/mysqlmanager.cc:
  unnecessary error checking was removed
server-tools/instance-manager/options.cc:
  minor fixes
server-tools/instance-manager/options.h:
  removed wrong declaration
2003-08-19 19:55:20 +04:00
unknown
e561c3ee60 First implementation of instance-manager carcass:
logging, options, angel process.


configure.in:
  added support for instance-manager directory
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2003-08-16 21:44:24 +04:00