summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/jimw/my/mysql-5.0-buildunknown2005-05-184-12/+12
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean mysys/default.c: Auto merged server-tools/instance-manager/commands.cc: Auto merged
| * commands.cc, parse.h, parse.cc, instance_options.cc:unknown2005-05-184-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Prefix enum symbols LOG_* with IM_, not to clash with system headers server-tools/instance-manager/instance_options.cc: Prefix enum symbols LOG_* with IM_, not to clash with system headers server-tools/instance-manager/parse.cc: Prefix enum symbols LOG_* with IM_, not to clash with system headers server-tools/instance-manager/parse.h: Prefix enum symbols LOG_* with IM_, not to clash with system headers server-tools/instance-manager/commands.cc: Prefix enum symbols LOG_* with IM_, not to clash with system headers
* | New file default_modify.c. Fixed a typo on mysqld.ccunknown2005-05-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed name of function my_correct_default_file to modify_defaults_file. Improved function and fixed some bugs in it. include/my_sys.h: Changed function name. include/mysql_com.h: New function, modify_defaults_file() libmysql/Makefile.shared: New file, default_modify.lo libmysql/libmysql.def: New function, modify_defaults_file() and fixed version number. libmysqld/libmysqld.def: New function, modify_defaults_file() mysys/Makefile.am: New file, default_modify.c mysys/default.c: Removed function from default.c. New, corresponding one is in default_modify.c, name is modify_defaults_file. server-tools/instance-manager/commands.cc: Changed function name. sql/mysqld.cc: Fixed typo.
* | fix for compilation problem with --with-openssl reported by Guilhemunknown2005-05-181-1/+2
| | | | | | | | | | server-tools/instance-manager/Makefile.am: fix for compilation problem with --with-openssl
* | fix commentsunknown2005-05-181-1/+1
|/ | | | | server-tools/instance-manager/commands.cc: fix column name
* Mergeunknown2005-05-1624-188/+1071
|\ | | | | | | | | | | | | | | | | include/my_sys.h: Auto merged libmysql/Makefile.shared: Auto merged mysys/default.c: SCCS merged
| * post-review fixesunknown2005-05-1620-438/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/my_sys.h: added prototype for the defaults correction function libmysql/Makefile.shared: my_chsize added to libmysql to let my_correct_defaults_file be used from libmysql mysys/default.c: New defaults function added we use it to correct defaults file. Currently the function doesn't lock defaults file. This is because of the linking and backwards-compatibility issues. This needs to be fixed later. mysys/my_chsize.c: comment added server-tools/instance-manager/buffer.cc: cleanup server-tools/instance-manager/commands.cc: refactoring: removed do_command method from most of the classes server-tools/instance-manager/commands.h: cleanup server-tools/instance-manager/guardian.cc: cleanup server-tools/instance-manager/instance.cc: cleanup server-tools/instance-manager/instance_map.cc: cleanup server-tools/instance-manager/instance_options.cc: cleanup server-tools/instance-manager/instance_options.h: cleanup server-tools/instance-manager/listener.cc: cleanup server-tools/instance-manager/log.cc: cleanup server-tools/instance-manager/manager.cc: cleanup server-tools/instance-manager/messages.cc: new errors added server-tools/instance-manager/mysql_connection.cc: cleanup server-tools/instance-manager/mysql_manager_error.h: new error codes added server-tools/instance-manager/mysqlmanager.cc: clenup server-tools/instance-manager/options.cc: cleanup server-tools/instance-manager/parse.cc: removed unused function server-tools/instance-manager/parse.h: removed prototype server-tools/instance-manager/protocol.cc: cleanup server-tools/instance-manager/protocol.h: added enum to be used in protocol.cc instead of the constants
| * mergeunknown2005-04-2115-41/+1042
| |\
| | * WL#2246 "IM: Add ability to change instance options, add server logs ↵unknown2005-04-0915-47/+1052
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling" ported to the current version of the IM server-tools/instance-manager/commands.cc: Log and set options commands added server-tools/instance-manager/commands.h: Log and set options commands added server-tools/instance-manager/factory.cc: Log and set options factory entries added server-tools/instance-manager/factory.h: prototypes added server-tools/instance-manager/instance_options.cc: fill_log_options() added server-tools/instance-manager/instance_options.h: log processing options and funcctions added server-tools/instance-manager/messages.cc: new error messages added (log and option processing-related) server-tools/instance-manager/mysql_connection.cc: minor fixes server-tools/instance-manager/mysql_manager_error.h: new error codes added server-tools/instance-manager/parse.cc: parser fixed to recognize new commands. function to parse command-line options added server-tools/instance-manager/parse.h: header fixed in line with .cc changes server-tools/instance-manager/parse_output.cc: cleanup server-tools/instance-manager/parse_output.h: header guards added server-tools/instance-manager/protocol.cc: Protocol support extended to provide messages in ok packet server-tools/instance-manager/protocol.h: protocol support extended: ok packet could contain messages
* | | yassl changeset 2:unknown2005-04-301-3/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove FIX_GCC_LINKING_PROBLEM and -DDEFINE_CXA_PURE_VIRTUAL replace echo in configure.in with AC_MSG_WARN/AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 set $USE_MYSYS_NEW even if CXX is g++ yassl bugfixes instantiate all yassl templates explicitly client/Makefile.am: mysqlbinlog as a c++ program may need my_new.cc (if CXX=gcc) no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqladmin.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc client/mysqlbinlog.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc configure.in: echo should be AC_MSG_WARN or AC_MSG_ERROR don't set -DUSE_MYSYS_NEW for gcc 2.95 (to restore old behaviour) set $USE_MYSYS_NEW even if CXX is g++ (for yassl, as it can be linked with C programs) remove -DDEFINE_CXA_PURE_VIRTUAL - -DUSE_MYSYS_NEW is enough extra/yassl/mySTL/list.hpp: bugfixes extra/yassl/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/src/crypto_wrapper.cpp: instantiate templates explicitly extra/yassl/src/yassl_imp.cpp: instantiate templates explicitly extra/yassl/src/yassl_int.cpp: instantiate templates explicitly extra/yassl/taocrypt/include/runtime.hpp: use -DUSE_MYSYS_NEW not -DDEFINE_CXA_PURE_VIRTUAL assert in __cxa_pure_virtual remove dummy (and thus dangerous) __cxa_guard_acquire/__cxa_guard_release extra/yassl/taocrypt/src/Makefile.am: no need to mess with CXXFLAGS anymore. Instantiate all templates explicitly extra/yassl/taocrypt/src/integer.cpp: instantiate templates explicitly extra/yassl/taocrypt/src/rsa.cpp: instantiate templates explicitly include/my_global.h: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc mysys/my_new.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc server-tools/instance-manager/command.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc sql/ha_blackhole.cc: typo fixed sql/ha_innodb.cc: warning fixed sql/item_func.cc: use LL() sql/mysqld.cc: no FIX_GCC_LINKING_PROBLEM anymore - it's in my_new.cc
* | Merge mysqldev@production.mysql.com:my/mysql-5.0-buildunknown2005-04-113-9/+15
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| * | make server logs less frightening, when using IMunknown2005-04-111-2/+2
| | | | | | | | | | | | | | | server-tools/instance-manager/instance.cc: fix username used for monitoring purposes to make logging more verbose
| * | Fix for bug #9808unknown2005-04-111-6/+12
| | | | | | | | | | | | | | | server-tools/instance-manager/commands.cc: check pointer for null before using it
| * | Fix for Bug #9589unknown2005-04-111-1/+1
| |/ | | | | | | | | server-tools/instance-manager/options.cc: remove [mysql] group from the list of the groups read by the mysqlmanager (resulted from wrong merge long ago)
* | Enable IM in the binary distribution and fix Bug #9513 (mysql.server script ↵unknown2005-04-041-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | 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
* Revert the inclusion of 'signal.h' as the module contains 'kill()'.unknown2005-03-221-0/+1
| | | | | server-tools/instance-manager/instance.cc: Revert the inclusion of 'signal.h' as this module contains 'kill()'.
* Fix for AIX compilation failure: sacred knowledge of my_global.h nature (it ↵unknown2005-03-2223-43/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should be included before any other include) was hidden from me. server-tools/instance-manager/commands.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/commands.h: Fix for AIX compilation failure & cleanup server-tools/instance-manager/factory.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/guardian.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/guardian.h: Fix for AIX compilation failure & cleanup server-tools/instance-manager/instance.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/instance.h: Fix for AIX compilation failure & cleanup server-tools/instance-manager/instance_map.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/instance_map.h: Fix for AIX compilation failure & cleanup server-tools/instance-manager/instance_options.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/log.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/manager.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/messages.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/messages.h: Fix for AIX compilation failure & cleanup server-tools/instance-manager/mysql_connection.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/mysqlmanager.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/options.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/parse.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/parse_output.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/protocol.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/protocol.h: Fix for AIX compilation failure & cleanup server-tools/instance-manager/thread_registry.cc: Fix for AIX compilation failure & cleanup server-tools/instance-manager/user_map.h: Fix for AIX compilation failure & cleanup
* fix to avoid relinking on each "make"unknown2005-03-021-2/+2
| | | | | server-tools/instance-manager/Makefile.am: "Makefile" target removed
* portability fixunknown2005-02-281-0/+1
|
* post-review fixes + cleanup + some minor fixesunknown2005-02-2716-90/+206
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/buffer.cc: coding style fixes server-tools/instance-manager/buffer.h: wrong constructor initialisation fixed server-tools/instance-manager/commands.cc: cleanup server-tools/instance-manager/guardian.cc: cleanup + added lock/unlock routines server-tools/instance-manager/guardian.h: GUARD_NODE moved to the header server-tools/instance-manager/instance.cc: Fix for the linuxthreads/POSIX signal handling problem (see comments in the code) server-tools/instance-manager/instance.h: condition variable renamed and commented server-tools/instance-manager/instance_map.cc: We need to refresh guardian during flush_instances server-tools/instance-manager/instance_map.h: removed obsolete function declaration server-tools/instance-manager/instance_options.cc: added caching of computed values server-tools/instance-manager/instance_options.h: added vars to cache some option values server-tools/instance-manager/listener.cc: check whether we are running on the linux threads server-tools/instance-manager/manager.cc: lock guardian before init() server-tools/instance-manager/parse_output.cc: cleanup server-tools/instance-manager/priv.cc: added global variables to detect whether we are running on the LinuxThreads server-tools/instance-manager/priv.h: added global variables to detect whether we are running on the LinuxThreads
* Merge mysql.com:/home/cps/mysql/trees/mysql-5.0unknown2005-02-201-1/+1
|\ | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/devel/im-fix-review include/my_sys.h: Auto merged server-tools/instance-manager/Makefile.am: Auto merged
| * CPPFLAGS is substituted with CXXFLAGS to work with older automake. Serg, now ↵unknown2005-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | 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.
* | new variant of passwd() by S. Vojtovichunknown2005-02-182-7/+12
| | | | | | | | | | | | | | 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
* | made IM to work with --defaults-file smoothlyunknown2005-02-189-16/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-my.cnf~9322f78f12eb2f3c: Delete: support-files/my.cnf include/my_sys.h: fixed prototype to reflect changes in default.c mysys/default.c: use my_search_option_files instead of process_default_option_files. This is used from the IM. server-tools/instance-manager/instance.cc: added parameter to complete_initialization(). this ine marks whether we are creating the only instance (for instance, when no config file given) server-tools/instance-manager/instance.h: prototype changed server-tools/instance-manager/instance_map.cc: Now call my_search_option_files to work smootly with --defaults-file server-tools/instance-manager/instance_map.h: added first_option member. This is set of mysqlmanager was started with --defaults-file or with --extra-defaults-file to be passed to the my_search_option_files server-tools/instance-manager/instance_options.cc: if we have only one instance, name the pidfile `hostname`.pid for compatibility reasons. server-tools/instance-manager/instance_options.h: header fixed according to .cc server-tools/instance-manager/manager.cc: prototype fixed server-tools/instance-manager/options.cc: save --defaults-file of --defaults-extra-file to pass it to my_search_option_files server-tools/instance-manager/options.h: added an optin to save --default-file options support-files/Makefile.am: revert changes
* | Merge mysql.com:/home/cps/mysql/trees/mysql-5.0unknown2005-02-1531-685/+1135
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | 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
| * some more cleanups and fixesunknown2005-02-1512-32/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/commands.cc: typo fixed server-tools/instance-manager/instance.cc: moved options.complete_initialization to the instance::complete_initialization server-tools/instance-manager/instance.h: moved options.complete_initialization to the Instance::complete_initialization server-tools/instance-manager/instance_map.cc: moved options.complete_initialization to the Instance::complete_initialization, added code to create default instance if none is given iin config. file server-tools/instance-manager/instance_map.h: complete_initialization now returns an error in case of a problem server-tools/instance-manager/instance_options.cc: some error handling added server-tools/instance-manager/instance_options.h: error handling added server-tools/instance-manager/manager.cc: error handling added server-tools/instance-manager/mysqlmanager.cc: stop mysqlmanager if options were not loaded correctly server-tools/instance-manager/options.cc: return-value added server-tools/instance-manager/options.h: return-value added to the OPtions::load() server-tools/instance-manager/parse_output.cc: no need to examine mysqld --help -v termination status
| * various fixesunknown2005-02-136-21/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/buffer.cc: use my_realloc instead of realloc server-tools/instance-manager/buffer.h: use my_malloc instead of malloc server-tools/instance-manager/commands.cc: No need to send a buffer if there were some error while writing to it server-tools/instance-manager/instance_options.cc: cleanup server-tools/instance-manager/manager.cc: check sigwait return value server-tools/instance-manager/parse_output.cc: fixed a bug, found with valgrind
| * Post-review fixes + some bugs fixed + several minor featuresunknown2005-02-1121-374/+591
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * --user option added to mysqlmanagerunknown2005-02-054-11/+92
| | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/mysql_connection.cc: removed unsed method server-tools/instance-manager/mysqlmanager.cc: add --user option handling server-tools/instance-manager/options.cc: --user option added server-tools/instance-manager/options.h: user option added + some cleanup
| * Fixed setup scripts to use mysqlmanager instead of mysqld_safeunknown2005-02-053-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Various fixes (cleanups, valgrind, makefiles, ...)unknown2005-02-0318-60/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * more fixes for IM to substitude mysqld_safe in startup scriptsunknown2005-01-3114-369/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-thread_repository.cc~bba09f64f8cb4037: Delete: server-tools/instance-manager/thread_repository.cc BitKeeper/deleted/.del-thread_repository.h~e6a3b9cab7a6612a: Delete: server-tools/instance-manager/thread_repository.h server-tools/instance-manager/commands.cc: All instances are guarded by default now, so we need to perform check on whether the instance is nonguarded, rather then guarded when adding it to the list of guarded instnces. server-tools/instance-manager/guardian.cc: Guardian rewritten to start instances by default, and shut them down, when exiting. Behaviour of the guardian in case of the instance crash has changed. Now it tries to restart an instance constantly in the first 2 seconds after the crash was noticed, and then it tries restart an instance once in the MONITORING_INTERVAL. If it failed to restart instance for "restart_retry" (compiled-in value) times, guardian stops trying to restart it. server-tools/instance-manager/guardian.h: Several new functions and variables declared. server-tools/instance-manager/instance.cc: now start doesn't call stop(), but rather tries to remove the pidfile itself server-tools/instance-manager/instance.h: cleanup server-tools/instance-manager/instance_map.cc: no more "admin" options server-tools/instance-manager/instance_map.h: User and password purged from instance_map options, as IM shouldn't know them server-tools/instance-manager/instance_options.cc: new option added -- shutdown_delay, guarded option now called nonguaded and has the opposite meaning server-tools/instance-manager/instance_options.h: appropriate changes, reflecting options addition/removal server-tools/instance-manager/manager.cc: shutdown process is complicated a bit -- at first signal thread should stop guardian, and only then the IM itself server-tools/instance-manager/messages.cc: update error message server-tools/instance-manager/options.cc: admin user/password purged from mysqlmanager options
| * IM mostly fixed according to Brian's directions. Will need to do some ↵unknown2005-01-2514-104/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | small Makefile.am cleanupunknown2005-01-281-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* cleanupunknown2004-12-292-7/+6
|
* Set default port to the one assigned by IANAunknown2004-12-231-1/+1
|
* Bug #7468 Instance Manager fails to compile: thread_registry.ccunknown2004-12-224-5/+3
| | | | | | | | | | | | | | | This fix icludes workaround for Irix compiler bug & removs some unused variables (resulted in warnings) server-tools/instance-manager/mysql_connection.cc: removed unused variable server-tools/instance-manager/parse.cc: removed unused variable server-tools/instance-manager/thread_registry.cc: Workaround for the Irix compiler bug server-tools/instance-manager/user_map.cc: removed unused variable
* fix for Bug#7386 - IM fails to compile on alpha with Compaq C++ compilerunknown2004-12-192-1/+7
| | | | | | | server-tools/instance-manager/mysql_connection.cc: use enum value instead of extern const in array definition server-tools/instance-manager/priv.cc: added a comment to remind of enum value in mysql_connection.cc
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2004-12-172-7/+13
|\ | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0
| * Fix for pekka's IM compilation failure at ndb.mysql.comunknown2004-12-172-7/+13
| | | | | | | | | | | | | | server-tools/instance-manager/mysql_connection.cc: move constructor to .cc file server-tools/instance-manager/mysql_connection.h: move constructor to .cc file
* | Fix for IM compilation failure (reported be Ramil).unknown2004-12-151-1/+1
| | | | | | | | | | server-tools/instance-manager/thread_registry.h: Fix for the problem, encountered by Ramil
* | WL#1051, more maintanable error messages.unknown2004-12-131-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* fix autobuild failuresunknown2004-12-126-15/+18
| | | | | | | | | | | | | | | | | server-tools/instance-manager/buffer.cc: fix typo server-tools/instance-manager/commands.cc: get rid of compiler warnings server-tools/instance-manager/guardian.cc: fix compiler warning server-tools/instance-manager/instance.cc: fix warnings server-tools/instance-manager/instance_map.cc: fix return value server-tools/instance-manager/instance_map.h: fix problem, caused autobuild failure. Looks like a gcc problem - "friend class <name>" doesn't work if specified before enclosed class <name> (this is not present in newer gcc versions)
* instance.cc:unknown2004-12-091-0/+1
| | | | | | | | explicit setting of reconnect (no behaviour change) server-tools/instance-manager/instance.cc: explicit setting of reconnect (no behaviour change)
* mergeunknown2004-12-0942-143/+4400
|\ | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union server-tools/instance-manager/mysqlmanager.cc: Auto merged sql/net_serv.cc: Auto merged
| * Some minor IM fixesunknown2004-11-157-20/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * few more fixes - fix makefile and get rid of strncasecmp in favour ofunknown2004-11-062-11/+18
| | | | | | | | | | | | | | | | | | | | my_strnncoll server-tools/instance-manager/Makefile.am: one more makefile fix server-tools/instance-manager/parse.cc: get rid of non-portable strnacasecmp
| * fix for the IM linking problemunknown2004-11-065-35/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * protability fixunknown2004-11-041-3/+3
| | | | | | | | | | | | | | server-tools/instance-manager/Makefile.am: portability fix BitKeeper/etc/ignore: Added server-tools/instance-manager/thr_alarm.c to the ignore list
| * linking problem fixunknown2004-11-042-13/+23
| | | | | | | | | | | | | | | | 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