summaryrefslogtreecommitdiff
path: root/server-tools
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2005-09-231-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root BitKeeper/etc/ignore: auto-union include/my_sys.h: Auto merged mysql-test/r/information_schema.result: Auto merged mysql-test/t/ctype_ujis.test: Auto merged sql/ha_federated.cc: Auto merged sql/handler.cc: Auto merged sql/item_func.h: Auto merged sql/log.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_lex.h: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_view.cc: Auto merged sql/table.cc: Auto merged
| * some last minute Windows compile fixes and makefile correctionsunknown2005-09-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/libmysqld/libmysqld.vcproj: don't recall exactly what this change was. VC++Files/libmysqltest/myTest.vcproj: redirect to client_release and client_debug folders VC++Files/mysql.sln: remove bdb from embedded classic target VC++Files/mysqlserver/mysqlserver.vcproj: redirect to lib_release and lib_debug folders server-tools/instance-manager/mysqlmanager.vcproj: redirect to proper folders sql/ha_federated.cc: fix windows compile problems sql/sql_acl.cc: fix windows compile problems sql/table.cc: fix windows compile problems sql/unireg.cc: fix windows compile problems VC++Files/mysqlserver/dummy.cpp: added new file to make mysqlserver generate a lib
* | fix warningsunknown2005-09-204-5/+8
|/ | | | | | | | | | | server-tools/instance-manager/buffer.cc: perform initialization of static consts in .cc file to respect VC6 server-tools/instance-manager/buffer.h: fix compiler warning server-tools/instance-manager/commands.cc: fix compiler warning server-tools/instance-manager/user_map.cc: fix compiler warning
* fixed the service bits of the IMunknown2005-09-1310-31/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/IMService.cpp: * setting username and password to NULL so that the IM runs at LocalSystem (this should be changed soon) * implemented stop service by raising a sigterm * implemented start service by loading options and calling manager() server-tools/instance-manager/IMService.h: changed the sig for Run() server-tools/instance-manager/WindowsService.cpp: default debugging to false changed the sig of RuN() server-tools/instance-manager/WindowsService.h: change the sig of run() server-tools/instance-manager/instance.cc: * remove the inclusion of process.h * concat all args into a single buffer to pass to CreateProcess server-tools/instance-manager/instance_options.cc: quoting the binary to handle paths with quotes server-tools/instance-manager/listener.cc: use a timeval for select so that our select will only run for 100 msec before we check to see if we are shutting down server-tools/instance-manager/mysqlmanager.cc: if we are given the stand alone option, then run the manager as standalone server-tools/instance-manager/options.cc: Added stand alone command line arg server-tools/instance-manager/options.h: Added stand alone command line arg
* Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-132-36/+114
|\ | | | | | | | | | | | | into linux.site:/home/reggie/bk/mysql-5.0-new
| * A few changes to fix compiling on Windowsunknown2005-09-062-36/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/mysql.sln: Added instance manager project VC++Files/mysys/mysys.vcproj: Added mf_unixpath.c scripts/make_win_src_distribution.sh: Updated to include server-tools folder (which includes IM) server-tools/instance-manager/instance.cc: fixed typo server-tools/instance-manager/mysqlmanager.vcproj: fixed up all the filenames in the IM project
* | options.cc:unknown2005-09-101-1/+1
|/ | | | | | | | Fix typo. server-tools/instance-manager/options.cc: Fix typo.
* Remove a no longer used header.unknown2005-08-291-1/+0
|
* Cleanup the instance manager code.unknown2005-08-2919-339/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-factory.h~c1679505d3a6dd53: Delete: server-tools/instance-manager/factory.h BitKeeper/deleted/.del-factory.cc~6836cccd4cd35b4d: Delete: server-tools/instance-manager/factory.cc server-tools/instance-manager/Makefile.am: - remove Commands_factory: it'll be needed when we add support for NNTP/HTTP connections, currently it only adds unnecessary complexity. server-tools/instance-manager/commands.cc: - fix coding style: no else after return; fix comments, make one place a bit faster. server-tools/instance-manager/guardian.cc: - fix coding style and comments. - we must register the current thread in the thread registry before entering pthread_cond_timedwait, because at shutdown the thread registry will try to kick out of wait all blocked threads. Unregistered threads are not awakened by the registry. This fixes the failinig assert in Thread_registry::~Thread_registry at shutdown, when shutdown is requested and there is an instance monitored by Guardian. server-tools/instance-manager/guardian.h: - fix coding style: enums must start with enum_ server-tools/instance-manager/instance.h: - move comment to the variable it comments server-tools/instance-manager/instance_map.cc: - cleanup server-tools/instance-manager/instance_options.cc: - cleanup; no else after return (fix coding style). server-tools/instance-manager/manager.cc: - fix alignment; make some code easier to read. server-tools/instance-manager/mysql_connection.cc: - remove Commands_factory server-tools/instance-manager/options.cc: - fix a possible crash when the instance manager is started with --no-defaults --defaults-file=~/.my.cnf: if we return without cloning saved_argv by calling load_defaults, Options::cleanup will crash on attempt to free_defaults(saved_argv); server-tools/instance-manager/parse.cc: - get rid of Commands_factory server-tools/instance-manager/parse.h: - get rid of Commands_factory server-tools/instance-manager/parse_output.cc: - in parse_output_and_get_value return error also if the specified pattern was not found, or the command failed to execute. server-tools/instance-manager/portability.h: - fix coding style (// comments are allowed only at ends of lines) server-tools/instance-manager/thread_registry.cc: - implement Thread_registry::cond_timedwait server-tools/instance-manager/thread_registry.h: - implement Thread_registry::cond_timedwait; remove unused out parameter from Thread_registry::cond_wait. server-tools/instance-manager/user_map.cc: - safety: newline can take 2 bytes.
* Fix a -ansi -pedantic compile failure.unknown2005-08-221-1/+1
|
* Fix for BUG#10957 "stop instance, issued after flush instances causes IM to ↵unknown2005-08-193-101/+241
| | | | | | | | | | | | | | | | crash" Recommited with post-review fixes server-tools/instance-manager/instance.cc: fix behaviour of monitoring routines: they should not rely on the fact that instance object which was used when the instances started exists at stop(). Instead routines should save the name of the instance and look for it in the instance_map when needed. server-tools/instance-manager/instance.h: new functions declared. functions, which were converted to static removed from the class. server-tools/instance-manager/instance_options.cc: fix valgrind warning
* Clean up merge from 4.1unknown2005-08-151-1/+1
| | | | | | | | | | | mysql-test/r/func_date_add.result: Update results mysql-test/r/func_time.result: Update results server-tools/instance-manager/protocol.cc: Fix call to list_rest() sql/sp_head.cc: sp_change_db() removed, call mysql_change_db() instead.
* Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-104-64/+42
|\ | | | | | | | | | | | | | | into linux.site:/home/reggie/bk/mysql-5.0-new server-tools/instance-manager/IMService.cpp: Auto merged
| * changes to IM code that came from Petr's reviewunknown2005-08-093-7/+7
| | | | | | | | | | | | | | | | | | server-tools/instance-manager/IMService.cpp: syntax change requested by Petr server-tools/instance-manager/options.cc: return 1 instead of -1 server-tools/instance-manager/options.h: changed return value of setup_windows_defaults to int from void
| * fixed assignments to meet server coding guidelinesunknown2005-08-091-3/+3
| |
| * changes to IM that came from Petr and JimW's review.unknown2005-08-093-63/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/IMService.cpp: make sure HandleServiceOptions returns 0 on success and 1 on failure server-tools/instance-manager/mysqlmanager.cc: default return value is 1. simplify some code bits by just jumping to err on error. move options.cleanup inside the err block. In this case, the err block is more than just an error block. It is the terminating block for both error and success. You set return_value to 0 for success or leave it as 1 for failure. This simplies this function a bit. server-tools/instance-manager/options.cc: remove the malloc for default password filename on Windows and replace with statically allocated memory. default Options:saved_argv to NULL so that we will know if we need to free it in cleanup() setup the default config file location for Windows inside the setup_windows_defaults function and remove this code from load() rework setup_windows_defaults so that it properly returns 0 on success and 1 on error and so it fills in the default location for the log file, password file, and config file.
* | removing trailing spacesunknown2005-08-091-3/+3
| |
* | small corrections to the IM.unknown2005-08-092-14/+15
|/ | | | | | | | server-tools/instance-manager/IMService.cpp: removed \n from log_info calls as these will be added automatically server-tools/instance-manager/user_map.cc: added back in support for password files using \r\n, this time without breaking the const contract.
* New "Instance Manager" code:unknown2005-08-0512-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename "port.h" to "portability.h" to avoid conflict with system header file name, and include the file in "Makefile.am". server-tools/instance-manager/Makefile.am: Ensure that the (recently added) header "portability.h" (renamed from "port.h") gets included in the source packages. server-tools/instance-manager/guardian.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/instance.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/instance_options.h: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/listener.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/log.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/mysqlmanager.vcproj: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/options.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/parse_output.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/portability.h: Adapt the protective CPP symbol to the changed file name. server-tools/instance-manager/priv.cc: Rename "port.h" to "portability.h" to avoid conflict with system header file name. server-tools/instance-manager/priv.h: Rename "port.h" to "portability.h" to avoid conflict with system header file name.
* post-review fixunknown2005-08-051-4/+5
| | | | | server-tools/instance-manager/listener.cc: some more cleanup
* chmod -x new IM filesunknown2005-08-056-0/+0
| | | | | | | | | | | | | | | server-tools/instance-manager/WindowsService.cpp: Change mode to -rw-rw-r-- server-tools/instance-manager/WindowsService.h: Change mode to -rw-rw-r-- server-tools/instance-manager/port.h: Change mode to -rw-rw-r-- server-tools/instance-manager/mysqlmanager.vcproj: Change mode to -rw-rw-r-- server-tools/instance-manager/IMService.cpp: Change mode to -rw-rw-r-- server-tools/instance-manager/IMService.h: Change mode to -rw-rw-r--
* IM port cleanupunknown2005-08-058-227/+213
| | | | | | | | | | | | | | | | | | | server-tools/instance-manager/IMService.cpp: coding style fixes: tabs, trailing spaces, offset e.t.c server-tools/instance-manager/WindowsService.cpp: coding style fixes: tabs, trailing spaces, offset e.t.c server-tools/instance-manager/WindowsService.h: coding style fixes: tabs, trailing spaces, offset e.t.c server-tools/instance-manager/instance.cc: cleanup & coding style fixes: tabs, trailing spaces, offset e.t.c server-tools/instance-manager/listener.cc: coding style fixes: tabs, trailing spaces, offset e.t.c server-tools/instance-manager/manager.cc: coding style fixes: tabs, trailing spaces, offset e.t.c server-tools/instance-manager/options.cc: coding style fixes: tabs, trailing spaces, offset e.t.c server-tools/instance-manager/user_map.cc: simplify password file processing
* IM port fixes: fix crash on startup, add more error checking, get rid of ↵unknown2005-08-058-46/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary code. server-tools/instance-manager/commands.cc: fix memory leak server-tools/instance-manager/guardian.cc: don't check pthread_mutex_lock/unlock return value, as it never returns error if properly used (no self deadlocks) and initialized server-tools/instance-manager/guardian.h: prototype fixed server-tools/instance-manager/instance_map.cc: don't check pthread_mutex_lock/unlock status, as it never returns error if properly used (no self deadlocks) and initialized server-tools/instance-manager/instance_map.h: prototype fixed server-tools/instance-manager/listener.cc: initialize highest-numbered descriptor to 0 for select before setting it with max(n, sockets[i]), ifdef unix-specific code server-tools/instance-manager/manager.cc: remove commented stuff server-tools/instance-manager/options.cc: fix crash in load_defaults, which happened on all Unix systems due to const char *Options::config_file= NULL. Check return value for GetModuleFileName. Get rid of obscure default_config_file[FN_REFLEN]= "/etc/my.cnf"; which was never used
* Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-0425-218/+1231
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into fedora.(none):/home/reggie/bk/im_patch server-tools/instance-manager/manager.cc: Auto merged server-tools/instance-manager/mysqlmanager.cc: Auto merged server-tools/instance-manager/options.h: Auto merged server-tools/instance-manager/commands.cc: final merge of IM port code for Windows server-tools/instance-manager/instance_map.cc: final merge of IM port code for Windows server-tools/instance-manager/options.cc: final merge of IM port code for Windows
| * alot of formatting changes that came out of JimW's reviewunknown2005-08-0310-202/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/IMService.cpp: fixed tabs and spacing per JimW's review server-tools/instance-manager/WindowsService.cpp: fixed tabs and spacing per JimW's review server-tools/instance-manager/WindowsService.h: fixed tabs and spacing per JimW's review server-tools/instance-manager/commands.cc: fixed tabs and spacing per JimW's review server-tools/instance-manager/instance.cc: fixed tabs and spacing per JimW's review server-tools/instance-manager/instance_map.cc: fixed tabs and spacing per JimW's review server-tools/instance-manager/listener.cc: fixed tabs and spacing per JimW's review server-tools/instance-manager/manager.cc: fixed tabs and spacing per JimW's review server-tools/instance-manager/options.cc: fixed tabs and spacing per JimW's review server-tools/instance-manager/user_map.cc: fixed tabs and spacing per JimW's review
| * initial import of Windows port of IM.unknown2005-07-2025-220/+1236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/commands.cc: type cleanups for compiling on Windows now using Options::config_file for the location of the single my.cnf file we are using server-tools/instance-manager/guardian.cc: pthread_mutex_lock and unlock do not return a value on Windows so we return 0 in all cases server-tools/instance-manager/instance.cc: big changes here. Had to implement Windows versions of launch_and_wait and kill() server-tools/instance-manager/instance.h: added some function defs server-tools/instance-manager/instance_map.cc: pthread_mutex_lock and unlock do not return a value on Windows Also, now using only the file named as Options::config_file server-tools/instance-manager/instance_options.h: added reference to port.h server-tools/instance-manager/listener.cc: reworked and simplified the socket handling code. Added windows versions of the code that sets the sockets to be non-blocking and non-inheritable server-tools/instance-manager/listener.h: change Options to always be a struct. Really surprised GCC was letting this go. Options was declared to be struct in some places and class in other places. server-tools/instance-manager/log.cc: added reference to port.h server-tools/instance-manager/manager.cc: moved all the signal code inside some #ifndef __WIN__ blocks server-tools/instance-manager/manager.h: change Options to always be a struct. Really surprised GCC was letting this go. Options was declared to be struct in some places and class in other places. server-tools/instance-manager/mysqlmanager.cc: added in the Windows service code. server-tools/instance-manager/options.cc: Added in the windows options for running as a service and the code for loading settings only from a single file server-tools/instance-manager/options.h: added definitions for the new Windows service vars and routines server-tools/instance-manager/parse_output.cc: added reference to port.h server-tools/instance-manager/priv.cc: added reference to port.h server-tools/instance-manager/priv.h: linuxthreads should not be visible on Windows server-tools/instance-manager/thread_registry.cc: more __WIN__ blocking server-tools/instance-manager/user_map.cc: fixed passwd file code to handle files with \r\n line endings server-tools/instance-manager/IMService.cpp: New BitKeeper file ``server-tools/instance-manager/IMService.cpp'' server-tools/instance-manager/IMService.h: New BitKeeper file ``server-tools/instance-manager/IMService.h'' server-tools/instance-manager/WindowsService.cpp: New BitKeeper file ``server-tools/instance-manager/WindowsService.cpp'' server-tools/instance-manager/WindowsService.h: New BitKeeper file ``server-tools/instance-manager/WindowsService.h'' server-tools/instance-manager/mysqlmanager.vcproj: New BitKeeper file ``server-tools/instance-manager/mysqlmanager.vcproj'' server-tools/instance-manager/port.h: New BitKeeper file ``server-tools/instance-manager/port.h''
* | Post-review fixes for WL#2713 "Change IM behaviour so, that it only reads ↵unknown2005-07-217-69/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and alters one config file only." server-tools/instance-manager/commands.cc: get rid of single_defaults_file_option and use Options::config_file instead server-tools/instance-manager/commands.h: get rid of single_defaults_file_option and use Options::config_file instead server-tools/instance-manager/instance_map.cc: get rid of single_defaults_file_option and use Options::config_file instead server-tools/instance-manager/instance_map.h: get rid of single_defaults_file_option and use Options::config_file instead server-tools/instance-manager/manager.cc: get rid of single_defaults_file_option and use Options::config_file instead server-tools/instance-manager/options.cc: Disable --defaults-extra-file and --no-defaults options for the IM as they have no sence. Don't use print_defaults as it prints out wrong "first option" information for IM. Use only Options::config_file to process options server-tools/instance-manager/options.h: get rid of single_defaults_file_option and use Options::config_file instead
* | WL #2713 Change IM behaviour so, that it only reads and alters one config ↵unknown2005-07-219-32/+105
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | file only. Implemented on brian's request. server-tools/instance-manager/Makefile.am: define default config file server-tools/instance-manager/commands.cc: Use specified or default file to edit with SET commands instead of hardcoded file server-tools/instance-manager/commands.h: add member to SET commands server-tools/instance-manager/instance_map.cc: rename first_option -> single_defaults_option, made logging a bit more verbose server-tools/instance-manager/instance_map.h: rename first_option -> single_defaults_file + made it public server-tools/instance-manager/manager.cc: rename first_option -> single_defaults_file server-tools/instance-manager/mysqlmanager.cc: goto generic error label instead of simple return server-tools/instance-manager/options.cc: skip --defaults-extra file and give a message if it was specified, made IM to read one config file only server-tools/instance-manager/options.h: added new members to the option structure
* rename: store_to_string -> store_to_protocol_packetunknown2005-06-153-48/+57
|
* Fix for Bug #11200 show instance options returns garbage instead of log optionsunknown2005-06-141-0/+3
| | | | | server-tools/instance-manager/commands.cc: Send an empty string in the option_value column, if no option value is given
* several fixes to the previous patchunknown2005-06-074-8/+10
| | | | | | | | | | | server-tools/instance-manager/instance_options.cc: fix order of if branches server-tools/instance-manager/instance_options.h: portability fix server-tools/instance-manager/parse_output.cc: remove stupid comment server-tools/instance-manager/parse_output.h: portability fix
* post-review fixesunknown2005-06-0710-57/+60
| | | | | | | | | | | | | | | | | | | | | | | server-tools/instance-manager/commands.cc: remove commented out code server-tools/instance-manager/instance.cc: use flag instead of int variable server-tools/instance-manager/instance.h: no more default values server-tools/instance-manager/instance_map.cc: use flag to be more verbose server-tools/instance-manager/instance_options.cc: don't read options when looking for an option, use strmake instead of strchr server-tools/instance-manager/instance_options.h: fix comment, use flag instead of int value server-tools/instance-manager/listener.cc: don't like c++ comments server-tools/instance-manager/log.cc: safety: strmake adds trailing zero to the string server-tools/instance-manager/parse_output.cc: use strmake instead of strncpy, renamed varianles to make code more readable server-tools/instance-manager/parse_output.h: get rid of default value
* fix IM to display version string in "show instance status" (Bug #10229)unknown2005-06-017-35/+129
| | | | | | | | | | | | | | | | | | | server-tools/instance-manager/buffer.h: fix for the valgring error server-tools/instance-manager/commands.cc: sent the version string server-tools/instance-manager/instance_options.cc: compute and store the version string server-tools/instance-manager/instance_options.h: add a version string option, and added caching of the mysqld_path length server-tools/instance-manager/options.cc: fix valgrind error server-tools/instance-manager/parse_output.cc: Add an option to parse_output_and_get_value in order to be able to get the rest of the string after the found word in the output of popen() (E.g. a version string). server-tools/instance-manager/parse_output.h: prototype changed
* 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
View Lorry Controller Status