summaryrefslogtreecommitdiff
path: root/support-files/mysql.server.sh
Commit message (Collapse)AuthorAgeFilesLines
* merge.Sergei Golubchik2010-11-251-3/+41
|\ | | | | | | | | | | checkpoint. does not compile.
| * Automatic mergeMichael Widenius2009-10-231-1/+12
| |\
| | * Fixes for binary distribution in tar fileMichael Widenius2009-10-231-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - mysql_install_db doesn't require --basedir option anymore - Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install - Move some files from share/mysql to where they have always been (1.0 - 5.0) - Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility) - Move man files to 'man' (from 'share/man') - Ensure that all scripts are executable mysql_secure_installation.sh - Added support for --basedir flag - Don't assume that the mysql binary is in the path Other: - Fixed crash when one got kill signal during bootstrap Docs/INSTALL-BINARY: Change references from MySQL to MariaDB Docs/mysql.info: Change references from MySQL to MariaDB README: Removed duplicate row configure.in: Change references from MySQL to MariaDB libmysql/libmysql.c: Assume that if version string contains '-maria-' we are also using MariaDB scripts/make_binary_distribution.sh: Fix that mysql_install_db mysqld_safe mysql_fix_privilege_tables has right paths for tar binary install Remove some files that should not be part of a MariaDB binary install Move some files from share/mysql to where they have always been (1.0 - 5.0) Move man files to 'man' (from 'share/man') Move scripts used when installing MariaDB to the scripts directory (Added symlinks in old place for compatibility) Removed generation of 'netware/init_db.sql', as it was never used Remove old reference to bk tree scripts/mysql_secure_installation.sh: Added support for --basedir flag Don't assume that the mysql binary is in the path Use .my.cnf files Removed a lot of useless 'echo' rows sql/mysqld.cc: Fixed crash when one got kill signal during bootstrap storage/maria/Makefile.am: Don't add internal test files to binary distributions storage/myisam/Makefile.am: Don't add internal test files to binary distributions support-files/Makefile.am: Make scripts executable support-files/config.huge.ini.sh: Removed execution bit support-files/config.medium.ini.sh: Removed execution bit support-files/config.small.ini.sh: Removed execution bit support-files/mysql.server.sh: Ensure this works also mysqld is in the 'bin' directory
| * | Add `configtest' option to the init script to check for a valid my.cnf file.Peter Lieverdink2009-10-161-2/+29
| |/
* | Fix previous merge: 'kill -0' (check PID exists) was changed to 'kill -9',Jonathan Perkin2009-12-161-1/+1
| | | | | | | | | | | | meaning a '/etc/init.d/mysql stop' would actually cause mysqld_safe to relaunch mysqld rather than shut it down.
* | Backport WL#4085: Merge revno:2617.56.29 from 6.0.Alexander Nozdrin2009-10-061-119/+59
|/
* merge patch for bug#31785Daniel Fischer2009-07-021-5/+12
|
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-buildunknown2008-03-261-5/+28
|\ | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build support-files/mysql.server.sh: Auto merged
| * Suggestion of Tim. Avoid unnecessary sleep.unknown2008-03-191-1/+1
| |
| * Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \unknown2008-03-191-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | isn't running Pass the process id of the manager as a parameter to "wait_for_pid" and if the manager isn't running, then do not continue to wait. Also, capture the error message of our process-existence test, "kill -0", as we expect errors and shouldn't pass them to the user. Additionally, be a bit more descriptive of what the problem is. support-files/mysql.server.sh: Test that the PID-file's manager is running while we're waiting for something to happen with the pid-file. Capture the error message of our process-existence test, "kill -0", as we expect errors and shouldn't pass them to the user. Additionally, be a bit more descriptive of what the problem is.
* | Merge production.mysql.com:/usersnfs/jperkin/bk/bug-27995/5.0unknown2007-11-051-1/+1
|\ \ | |/ | | | | | | | | | | | | into production.mysql.com:/usersnfs/jperkin/bk/build/5.1 support-files/mysql.server.sh: Auto merged
| * Provide better feedback to the user when unable to find MySQL filesunknown2007-11-051-1/+1
| | | | | | | | | | | | | | | | usually caused by a bad basedir setting. support-files/mysql.server.sh: Be more verbose in error message.
* | Makefile.am, make_binary_distribution.sh:unknown2007-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use custom 'pkgduppdir' mysql.server.sh: The server is installed in 'libexecdir' scripts/Makefile.am: Use custom 'pkgduppdir' scripts/make_binary_distribution.sh: Use custom 'pkgduppdir' support-files/mysql.server.sh: The server is installed in 'libexecdir'
* | Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maintunknown2007-04-121-10/+42
|\ \ | |/ | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint support-files/mysql.server.sh: Auto merged
| * BUG#27367 mysql.server should be LSB init script compliantunknown2007-04-121-3/+3
| | | | | | | | | | | | | | | | Moved cd $basedir to live in the start section, as it only applies to the start functionality and breaks the restart task
| * BUG#27367 mysql.server should be LSB init script compliantunknown2007-03-211-2/+11
| | | | | | | | | | support-files/mysql.server.sh: BUG#27367 Replaced [] with test syntax. Added test for locks on RedHat/SuSE systems
| * BUG#27367 mysql.server should be LSB init script compliantunknown2007-03-211-7/+30
| | | | | | | | | | | | support-files/mysql.server.sh: BUG#27367 Add force-reload and status options. Change usage message to reflect Replaced a shell call to cat with shell builtin read
* | Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maintunknown2007-03-201-1/+9
|\ \ | |/ | | | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint sql/slave.cc: Auto merged support-files/mysql.server.sh: Auto merged
| * BUG#26952: mysql.server needs to be able to not timeout in certain situationsunknown2007-03-131-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For systems running MySQL through heartbeat, it is imperitive that the startup scripts not only return correct return values, but do not return until success or failure has been determined. This is a different behavior than is typically wanted for the startup of a normal machine. This patch adds support for a timeout variable for mysql.server. Read from my.cnf, this variable defaults to 900 (the current default). A value of 0 means not to wait at all for startup confirmation. A negative value means to wait forever. support-files/mysql.server.sh: Added support for a timeout variable to control timing out our wait for server startup. BUG#26952
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my50-bug25341unknown2007-01-311-6/+18
|\ \ | |/ | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/bug25341/my51-bug25341 BitKeeper/etc/collapsed: auto-union support-files/mysql.server.sh: Auto merged
| * Bug#25341: "init.d/mysql stop" may timeout too quicklyunknown2007-01-311-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thirty five seconds is entirely too short of a period to wait for a server to exit. Instead, make a valliant effort to make sure it exits, and only give up after a very long period (arbitrarily chosen as 15 minutes). In addition, if we're being asked to restart the server, then don't try to start again if trying to stop the server failed. --- Return zero by default, when the script exits. --- Set return-/exit-value based on whether we successfully dealt with the PID-file. --- Don't wait that long if the program we're waiting on exits. It should only exit if the server is not going to be started. support-files/mysql.server.sh: Raise timeout to a pessimistic value, 15 minutes. We should only be willing to give up and exit after an extraordinary effort. --- Return zero by default, when the script exits. --- Set return-/exit-value based on whether we successfully dealt with the PID-file. --- Don't wait that long if the program we're waiting on exits. It should only exit if the server is not going to be started.
* | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maintunknown2006-11-171-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint mysql-test/lib/mtr_cases.pl: Auto merged sql/mysqld.cc: Auto merged sql/sql_table.cc: Auto merged support-files/mysql.server.sh: Auto merged mysql-test/mysql-test-run.pl: Use remote
| * This command is not portable, as POSIX does not require it; use . instead.unknown2006-11-161-1/+1
| | | | | | | | | | | | | | (Bug #24294)
* | Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1unknown2006-06-221-4/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged support-files/mysql.server.sh: Auto merged support-files/mysql.spec.sh: Auto merged
| * Fix for bug#18516 (also #19353, reported for 5.1):unknown2006-06-201-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to include "mysql_upgrade" in a RPM, it should also be called when the RPM is upgraded. support-files/mysql.server.sh: Support getting additional arguments, which need to be passed on to the server. This works only if the server is started through "mysqld_safe", as the IM will not pass such arguments. So if the IM would be used, additional arguments cause the start to fail (voluntarily). This feature is needed so that tools like RPM can start the server in an "isolated" way, see the patch to the RPM spec file (also in this changeset) to call "mysql_upgrade". support-files/mysql.spec.sh: Call "mysql_upgrade" during an RPM upgrade. "mysql_upgrade" needs a server to run, as it issues SQL commands. (This had been neglected previously.) It also needs to connect as "root", but in an RPM upgrade the password is unknown. To allow this, the server is started "--skip-grant-tables". Normally, this would open big security holes, so it is also started "--skip-networking", and access to the socket is limited to "mysql" + "root" by temporarily setting mode 700.
* | Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1unknown2006-06-141-0/+1
|\ \ | |/ | | | | | | support-files/mysql.server.sh: Auto merged
| * Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0unknown2006-06-141-0/+1
| |\ | | | | | | | | | | | | support-files/mysql.server.sh: Auto merged
| | * support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + ↵unknown2006-06-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | bug#20118 support-files/mysql.server.sh: Ensure that some necessary / useful system services have been started already, when the MySQL server is started. This fixes bug#18810 and bug#20118
* | | This is an implementation of two WL items:unknown2006-05-181-1/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - WL#3158: IM: Instance configuration extensions; - WL#3159: IM: --bootstrap and --start-default-instance modes The following new statements have been added: - CREATE INSTANCE; - DROP INSTANCE; The behaviour of the following statements have been changed: - SET; - UNSET; - FLUSH INSTANCES; - SHOW INSTANCES; - SHOW INSTANCE OPTIONS; BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833: Delete: mysql-test/t/im_options_set.imtest BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921: Delete: mysql-test/r/im_options_set.result BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048: Delete: mysql-test/t/im_options_unset.imtest BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f: Delete: mysql-test/r/im_options_unset.result client/get_password.c: Change prototype to avoid casting when using C-strings (char *). include/m_string.h: Moved LEX_STRING to global header from sql/ to be accessible from all components (IM for one). include/my_sys.h: Added constants for modify_defaults_file(). include/mysql_com.h: Removed duplicated declarations. my_sys.h should be used instead. libmysql/get_password.c: Change prototype to avoid casting when using C-strings (char *). mysql-test/mysql-test-run.pl: Added environment variables to be used from tests. mysql-test/r/im_daemon_life_cycle.result: Column name has been changed in SHOW INSTANCES. mysql-test/r/im_life_cycle.result: 1. Column name has been changed in SHOW INSTANCES. 2. Removed redundant SHOW INSTANCE STATUS statements. mysql-test/r/im_utils.result: Updated the result file. mysql-test/t/im_daemon_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_daemon_life_cycle.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysql-test/t/im_life_cycle.imtest: 1. Polishing; 2. Fixed a test error in 1.1.2. mysql-test/t/im_utils.imtest: Get Instance Manager and managed mysqld-instances enough time to start. mysys/default.c: Pass the name of the section to the handler function as well. mysys/default_modify.c: Added REMOVE_SECTION functionality. server-tools/instance-manager/IMService.cpp: Polishing: be more verbose. server-tools/instance-manager/IMService.h: Polishing: added copyright. server-tools/instance-manager/Makefile.am: Added new files. server-tools/instance-manager/WindowsService.cpp: Polishing: according to The Coding Style, TRUE/FALSE must be used instead of true/false. server-tools/instance-manager/WindowsService.h: Polishing: added copyright. server-tools/instance-manager/command.h: Polishing: provide a comment for the main operation of "Command" class. server-tools/instance-manager/commands.cc: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/commands.h: 1. Added support for CREATE INSTANCE, DROP INSTANCE statements; 2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS; 3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements; server-tools/instance-manager/guardian.cc: Added operations to retrieve state of managed instances. server-tools/instance-manager/guardian.h: Added operations to retrieve state of managed instances. server-tools/instance-manager/instance.cc: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance.h: 1. Provided an operation to check validity of instance name. 2. Added an attribute to distiguish mysqld-instances, whose configuration should be kept backward-compatible. server-tools/instance-manager/instance_map.cc: 1. Used the operation to check validity of instance name; 2. Added operations to manage instances. server-tools/instance-manager/instance_map.h: Added operations to manage instances. server-tools/instance-manager/instance_options.cc: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/instance_options.h: Changed Instance_options so that it will be possible to manage options on the fly. server-tools/instance-manager/listener.cc: 1. Remove reference to the instance of Options; 2. Use new Options naming scheme. server-tools/instance-manager/listener.h: Remove reference to the instance of Options; server-tools/instance-manager/log.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/manager.cc: Added a common for IM operation to work with configuration file. server-tools/instance-manager/manager.h: Added a common for IM operation to work with configuration file. server-tools/instance-manager/messages.cc: Added messages for new errors. server-tools/instance-manager/mysql_connection.cc: 1. Move a constant to common place. 2. Polishing. server-tools/instance-manager/mysql_manager_error.h: Added new errors. server-tools/instance-manager/mysqlmanager.cc: 1. Use error code from Options::load(); 2. Eliminate type-casting warning on Windows. server-tools/instance-manager/options.cc: Added support for user-management command-line options. server-tools/instance-manager/options.h: Added support for user-management command-line options. server-tools/instance-manager/parse.cc: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse.h: 1. Added support of new statements: - CREATE INSTANCE; - DROP INSTANCE. 2. Modified SET/UNSET. server-tools/instance-manager/parse_output.cc: Sorted out header files. server-tools/instance-manager/parse_output.h: Sorted out header files. server-tools/instance-manager/portability.h: 1. Added constants for Windows. 2. Moved system-dependent defines from instance_options.cc. server-tools/instance-manager/priv.cc: Updated version. server-tools/instance-manager/priv.h: Added some global constants. server-tools/instance-manager/protocol.cc: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/protocol.h: Replaced NAME_WITH_LENGTH by LEX_STRING. server-tools/instance-manager/thread_registry.cc: Polishing: use TRUE/FALSE instead of true/false. server-tools/instance-manager/user_map.cc: Added support for managing password database. server-tools/instance-manager/user_map.h: Added support for managing password database. sql/sp.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/sp_head.cc: Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization. sql/spatial.cc: Removed LEX_STRING_WITH_INIT. sql/spatial.h: Removed LEX_STRING_WITH_INIT. sql/sql_string.h: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/sql_trigger.cc: Moved STRING_WITH_LEN() macro out from sql (to m_string.h). sql/structs.h: Removed LEX_STRING_WITH_INIT. support-files/mysql.server.sh: Instruct Instance Manager to work in mysqld-safe compatible mode for backward compatibility. mysql-test/r/im_cmd_line.result: Added result file. mysql-test/r/im_instance_conf.result: Added result file. mysql-test/r/im_options.result: Added result file. mysql-test/t/im_cmd_line.imtest: IM command-line options test. mysql-test/t/im_instance_conf-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_instance_conf.imtest: Added a new test case for checking instance-management. mysql-test/t/im_life_cycle-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. mysql-test/t/im_options.imtest: Join im_options_set and im_options_unset and add new tests. mysql-test/t/im_utils-im.opt: Set minimal monitoring interval for Instance Manager to speed up testing. server-tools/instance-manager/exit_codes.h: New file for defining exit codes for user-management mode. server-tools/instance-manager/user_management_commands.cc: User-management commands implementation. server-tools/instance-manager/user_management_commands.h: User-management command declarations.
* | Fix for Bug #16240unknown2006-04-061-2/+10
| | | | | | | | | | | | support-files/mysql.server.sh: Fixed so that if the datadir has been set via the command line, it won't be reset by specifing the basedir after.
* | Datadir variable should not be reset, if it wasunknown2005-12-141-2/+8
| | | | | | | | | | | | | | set in this script.
* | Fix handling of libexecdir and sbindir in mysql.server, and note thatunknown2005-08-261-6/+7
| | | | | | | | | | | | | | | | | | | | | | basedir and datadir settings in script may be overwritten by settings in configuration files. (Bug #12550) support-files/mysql.server.sh: Note that basedir, datadir settings can be overwritten by configuration, and make sbindir and libexecdir distinct from bindir when setting it based on basedir.
* | Merge mysql.com:/space/my/mysql-4.1-bug9444unknown2005-05-041-1/+1
|\ \ | |/ | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0 support-files/mysql.server.sh: Auto merged
| * - adjusted the start and stop priority level in the mysql.server init script ↵unknown2005-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | for chkconfig on Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux (e.g. RHEL3/RHEL4) support-files/mysql.server.sh: - adjusted the start and stop priority level for chkconfig on Red Hat Linux (BUG#9444) - we now match the levels used by the MySQL as shipped with Red Hat Linux (RHEL3/RHEL4)
* | Set bindir, datadir & others if --basedir is given. This ensures that one ↵unknown2005-04-161-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | only has to set basedir in [mysqld] group when moving a binary installation to a not default polace Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf) Search first for defaults files in basedir and then in datadir (like mysqld_safe) support-files/mysql.server.sh: Set bindir, datadir & others if --basedir is given. This ensures that one only has to set basedir in [mysqld] group when moving a binary installation to a not default polace Use for now safe_mysqld by default. (unless use-manager is set in the [mysql.server] option in my.cnf) Search first for defaults files in basedir and then in datadir (like mysqld_safe) I removed the test for localstatedir as default.c doesn't anymore read defaults files from localstatedir
* | Added more rows to test to get predictable resultsunknown2005-04-161-12/+68
| | | | | | | | | | | | | | | | | | | | mysql-test/t/range.test: Added more rows to test to get predictable results (if it still fails, we need to add even more rows) scripts/make_binary_distribution.sh: Apply Jims patch for mysql.server support-files/mysql.server.sh: Apply Jims patch to support mysqld_safe
* | Merge with 4.1unknown2005-04-161-2/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged sql/set_var.cc: Auto merged support-files/mysql.server.sh: Auto merged sql/ha_ndbcluster.cc: Merge sql/handler.cc: Merge sql/handler.h: Merge sql/mysqld.cc: Merge
| * Fix mysql.server.sh to use shell functions as replacementunknown2005-04-141-2/+8
| | | | | | | | | | | | | | | | | | | | for LSB init functions when they aren't available. (Bug #9852) support-files/mysql.server.sh: Use shell function instead of less portable alias command to create replacements for LSB functions, and also use argument in our replacements.
* | Mergeunknown2005-04-011-3/+14
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/group_by.result: Auto merged ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_subselect.h: Auto merged sql/sql_select.cc: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: merge sql/item_cmpfunc.cc: merge support-files/mysql.server.sh: merge
| * Bug #9507 /etc/init.d/mysql script does not stop mysqld correctlyunknown2005-03-311-3/+14
| | | | | | | | | | | | | | | | | | wait_for_pid function is fixed to wait for pid removal in "stop". recomitted with post-review fix support-files/mysql.server.sh: wait_for_pid function corrected to work properly with start/stop
* | merge 4.1->5.0unknown2005-03-311-1/+3
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/group_by.result: Auto merged mysql-test/r/metadata.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/union.test: Auto merged sql/item.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged support-files/mysql.server.sh: Auto merged
| * Portability fix (avoid bash-ism).unknown2005-03-301-1/+3
| | | | | | | | | | | | support-files/mysql.server.sh: Replace a non-portable "for" loop (bash style, fails on BSD) by an equivalent "while" loop. Note that the "stop" method is still wrong, as it does not wait for file removal.
* | IM setup patch. Enable IM instead of mysqld_safe in start/stop script.unknown2005-03-151-27/+32
| | | | | | | | | | | | | | | | | | | | | | Alter RPM to include mysqlmanger binary and config files. support-files/mysql.server.sh: mysql start/stop script altered to use mysqlmanager instead of mysqld_safe, novel 'reload' option was temporarily removed support-files/mysql.spec.sh: correct RPM to include mysqlmanager
* | Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-03-151-17/+44
|\ \ | |/ | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0 support-files/mysql.server.sh: Auto merged
| * Applied some changes to the mysql.server init script that are already ↵unknown2005-03-151-17/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | shipped as an additional patch in the 4.1.10a RPMs for SLES9/RHEL3: - small improvement: use LSB functions to display startup success and failure, if available. Fall back to more primitive builtin functions otherwise. - joined two pieces of code performing the same functionality into one "wait_for_pid" function - added a "reload" function (LSB requirement) support-files/mysql.server.sh: - small improvement: use LSB functions to display startup success and failure, if available. Fall back to builtin functions otherwise. - joined two pieces of code performing the same functionality into one "wait_for_pid" function - added a "reload" function (LSB requirement)
* | Fixed Bug#7873.unknown2005-02-171-1/+4
|/
* Merge with 4.0.18unknown2004-02-111-1/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union mysql-test/r/ctype_tis620.result-old: Merge rename: mysql-test/r/ctype_tis620.result -> mysql-test/r/ctype_tis620.result-old BUILD/compile-pentium-max: Auto merged BitKeeper/etc/config: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged configure.in: Auto merged mysql-test/t/ctype_tis620.test-old: Merge rename: mysql-test/t/ctype_tis620.test -> mysql-test/t/ctype_tis620.test-old Docs/Makefile.am: Auto merged client/mysqldump.c: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/my_sys.h: Auto merged include/myisam.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/ibuf/ibuf0ibuf.c: Auto merged innobase/include/dict0dict.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/log/log0log.c: Auto merged innobase/row/row0ins.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/ut/ut0mem.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_dynrec.c: Auto merged myisam/mi_key.c: Auto merged myisam/myisam_ftdump.c: Auto merged myisam/myisamdef.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/alter_table.result: Auto merged mysql-test/r/bdb.result: Auto merged mysql-test/r/bigint.result: Auto merged mysql-test/r/fulltext.result: Auto merged
| * extra newline removedunknown2004-02-031-5/+5
| |
| * another variant (bug #2185: mysql.server script echo bug)unknown2004-02-031-6/+4
| |
| * a fix (#2185: mysql.server script echo bug)unknown2004-02-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | thnx Paul. <monty> can you get the above into configure and make Makefile.am patch mysql.server.sh with the right values for mysql.server ? <monty> or do you think we should just put the above in mysql.server.sh directly <ramil> as you want <monty> the last is kind of hard to do with variables, so lets put the above in mysql.server.sh directly support-files/mysql.server.sh: #2185: mysql.server script echo bug
View Lorry Controller Status