summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
Commit message (Collapse)AuthorAgeFilesLines
* Merge qualinost.(none):/home/mtaylor/src/mysql-4.1-maintunknown2006-12-141-0/+1
|\ | | | | | | | | | | | | | | into qualinost.(none):/home/mtaylor/src/mysql-5.0-maint scripts/mysqld_safe.sh: Auto merged
| * Change permissions on $mysql_unix_port_dir if we create it so that everyone ↵unknown2006-12-141-0/+1
| | | | | | | | can access it.
| * mysqld_safe.sh:unknown2006-03-291-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | Added --help option, bug#16392 acinclude.m4: Use "$shrext_cmds" when testing if shared library exists, bug#16332 acinclude.m4: Use "$shrext_cmds" when testing if shared library exists, bug#16332 scripts/mysqld_safe.sh: Added --help option, bug#16392
* | Fix for bug #17353.unknown2006-04-171-4/+7
| | | | | | | | | | scripts/mysqld_safe.sh: Moved core file changing command outside of root-user only conditional
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-11-011-8/+11
|\ \ | |/ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean scripts/mysqld_safe.sh: Auto merged
| * Handle decision to use mysqld-max over mysqld within mysqld_safeunknown2005-10-311-8/+11
| | | | | | | | | | | | | | | | | | even when --ledir option is specified. (Bug #13774) scripts/mysqld_safe.sh: Figure out whether to use mysqld or mysqld-max after we have handled the command-line options and .cnf files.
* | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-07-191-10/+28
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/select.result: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged sql/des_key_file.cc: Auto merged sql/field_conv.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/select.test: Resolve conflicts scripts/mysqld_safe.sh: Resolve conflict sql/item.cc: Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR can be longer in 5.0 than 4.1. sql/log_event.cc: Resolve conflict sql/mysql_priv.h: Resolve conflict sql/mysqld.cc: Remove incorrect fix (merge from 4.1) sql/sql_show.cc: Resolve conflict
| * Fix handling of datadir by mysqld_safe to support specifying aunknown2005-06-241-11/+29
| | | | | | | | | | | | | | | | | | | | | | different DATADIR via the command line or during ./configure and still starting up mysqld_safe via a relative path. (Bug #7249) scripts/mysqld_safe.sh: Decouple figuring out which BASEDIR and DATADIR to use so that the only DATADIR we'll try to use without first verifying that it exists is the compiled-in default.
* | scripts/mysqld_safe.shunknown2005-05-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable. scripts/mysqld_safe.sh: Only add --defaults-extra-file=$DATADIR/my.cnf if $DATADIR/my.cnf is readable. Without this patch, running mysqld_safe gives: Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf Fatal error in defaults handling. Program aborted Could not open required defaults file: /opt/home/tim/m/50/m/data/my.cnf Fatal error in defaults handling. Program aborted These errors are printed by my_print_defaults; mysqld also encounters the same problem and quits.
* | Automerge / manual check of the fixes for NPTL configuration (bug#2173, ↵unknown2005-04-261-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug#5871, and bug#9497). Post-merge fix will follow. BitKeeper/deleted/.del-acinclude.m4~f4ab416bac5003: Automerge / manual check. configure.in: Automerge / manual check. include/my_global.h: Automerge / manual check. myisam/Makefile.am: Automerge / manual check. scripts/Makefile.am: Automerge / manual check. scripts/mysqld_safe.sh: Automerge / manual check. support-files/Makefile.am: Automerge / manual check. tools/mysqlmanager.c: Automerge / manual check.
| * Step 1 of the switch to support configuration with NPTL:unknown2005-04-201-1/+1
| | | | | | | | | | | | | | Rename 'IS_LINUX' configuration variable to 'TARGET_LINUX'.
* | Merge query_cache testsunknown2005-03-111-0/+9
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Do-compile: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/t/join_outer.test: Auto merged scripts/make_win_src_distribution.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/item_cmpfunc.h: Auto merged sql/sql_table.cc: Auto merged mysql-test/r/query_cache.result: Update results mysql-test/t/query_cache.test: Merge test
| * Create directory for UNIX socket in mysqld_safe if it doesn't already exist.unknown2005-03-021-0/+9
| | | | | | | | | | | | | | | | (Bug #8513) scripts/mysqld_safe.sh: Create directory for UNIX socket if it doesn't exist
* | Fixed a compatibility problem.unknown2005-02-231-5/+18
| | | | | | | | | | | | | | | | | | | | 1) If my.cnf is found in datadir and basedir, give a warning and use the one in basedir. 2) If my.cnf is found in datadir, use it, but give a warning. 3) No warning if my.cnf is in basedir.
* | Add --help to mysqld_safe. (Bug #7931)unknown2005-02-021-0/+26
| | | | | | | | | | scripts/mysqld_safe.sh: Add --help switch
* | Merge mysql.com:/home/jwinstead2/mysql-4.1-cleanunknown2005-01-061-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jwinstead2/mysql-5.0 client/mysqladmin.cc: Auto merged client/mysqldump.c: Auto merged include/my_pthread.h: Auto merged scripts/mysqld_safe.sh: Auto merged
| * Change mysqld_safe search for mysqld relative to the current working directoryunknown2005-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to only look for the mysqld binary (and english error strings) and assume the datadir from that. Then, if that datadir turns out to not exist, startup will fail. This avoids the behavior where mysqld_safe would go off and run a totally different binary because the data directory had been moved (even when --datadir was specified on the command line). (Bug #7249) scripts/mysqld_safe.sh: Don't actually verify that datadir exists when using relatively-located mysqld -- just assume that it does and either let it fail when it doesn't, or do the right thing when datadir is then set via the command line or my.cnf file.
* | mergedunknown2005-01-061-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union include/my_pthread.h: Auto merged innobase/os/os0file.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: merged manually
| * Use 'ps xaww' in mysqld_safe (on Linux) so whole command-line is searchedunknown2005-01-041-2/+2
| | | | | | | | | | | | | | | | for port and/or pid-file parameters. (Bug #5878) scripts/mysqld_safe.sh: Change 'ps xa' to 'ps xaww' so whole command-line is examined
* | Added checking for my.cnf file from environment variable MYSQL_HOMEunknown2005-01-041-5/+10
|/ | | | | | | | | | | | | | | | | | | | | instead of DATADIR. include/config-win.h: Added checks for environment variable MYSQL_HOME libmysql/Makefile.shared: Added checks for environment variable MYSQL_HOME mysys/Makefile.am: Added checks for environment variable MYSQL_HOME mysys/default.c: Removed checks for my.cnf file in datadir, instead added checking if my.cnf exists in environment variable MYSQL_HOME scripts/mysqld_multi.sh: Added checks for my.cnf file in environment variable MYSQL_HOME, if exists. scripts/mysqld_safe.sh: Added checks for my.cnf file in environment variable MYSQL_HOME, if exists.
* mysqld_safe.sh:unknown2004-11-301-2/+2
| | | | | | | | | | Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option. NOTE: this may make some installations behave differently, if they depend on this broken behavior. scripts/mysqld_safe.sh: Fix calls to my_print_defaults. Some how, --loose-verbose had been added before --no-defaults/defaults-file, which must be the first option. NOTE: this may make some installations behave differently, if they depend on this broken behavior.
* Portability fixes to mysqld_safe for non-Linux systems. Fix FIND_PROCunknown2004-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | for Solaris test, and fix if @IS_LINUX@ test in mysqld_safe itself. configure.in: Portability fix for FIND_PROC setting; on Solaris (and probably others), 'ps -p $$' inside a shell script just returns 'sh' for command line, even though $0 contains the filename. So, use 'ps -fp $$' in the test (it shows the full command line, e.g., 'sh configure'). Leave the actual FIND_PROC command as-is, since mysqld itself is not a shell script. scripts/mysqld_safe.sh: Portability fix for mysqld_safe on non-Linux systems. A bogus use of 'if' and 'test' caused non-bash shells to enter a section meant to be run only on Linux systems. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* better fix for bug#5001unknown2004-09-071-23/+14
|
* mysqld_safe.sh:unknown2004-08-311-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | bug #5001, added conditional if to test if port set, then only kill the processes for this port, not all processes (in the case of this bug where multiple servers are killed.) The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's discovery that mysqld_safe would get killed. In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file" was the case that evaluated as true, so in order to test, I had to comment that block out. scripts/mysqld_safe.sh: bug #5001, added conditional if to test if port set, then only kill the processes for this port, not all processes (in the case of this bug where multiple servers are killed.) The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's discovery that mysqld_safe would get killed. In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file" was the case that evaluated as true, so in order to test, I had to comment that block out.
* warn about multiple mysqld --user parameters only if their arguments differunknown2004-06-101-7/+1
| | | | | | | scripts/mysqld_safe.sh: don't protect mysqld from multiple --user commands - mysqld can take care of itself sql/mysqld.cc: warn about multiple --user parameters only if their arguments differ
* Fixed http address in some scripts (Bug #3460)unknown2004-04-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) (portability fix) Fixed that INTERVAL can handle big integers. (Bug #3498) Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473) mysql-test/mysql-test-run.sh: Fixed wrong http address (Bug #3460) mysql-test/r/func_time.result: Results for new test cases mysql-test/t/func_time.test: Added test of INTERVAL with big integers scripts/mysqld_safe.sh: Added html address to manual in case of error sql/field.cc: Output TIMESTAMP in 4.1 format for 4.1 tables (or for TIMESTAMP(19)) sql/item_timefunc.cc: Fixed that INTERVAL can handle big integers. (Bug #3498) sql/mysql_priv.h: Removed not needed prototype sql/sql_acl.cc: Fixed that hostname="" works identical as hostname="%" for table/column grants (Bug #3473) Moved GRANT_TABLE::GRANT_TABLE functions ou from class definition to make it possible to debug them sql/structs.h: Fix for long values to INTERVAL
* - fixed early removing of socket file when multiple instances of mysqld areunknown2004-01-151-1/+1
| | | | | | | | | | | started via mysqld_safe (BUG#2114) Thanks to Rodrigo Marchant for the suggestion scripts/mysqld_safe.sh: - fixed early removing of socket file when multiple instances of mysqld are started via the script (BUG#2114) Thanks to Rodrigo Marchant for the suggestion
* do not put --user into command line if the value comes from [mysqld] or ↵unknown2003-12-191-3/+9
| | | | | | | | | [server] sections Bug #2163
* make mysqld to respect socket/port options of mysqld_safe command lineunknown2003-09-271-9/+13
| | | | | | | | and [mysqld_safe] section in my.cnf, even if they are also specified in [mysql] section.
* Added a warning to my_print_defaults if --verbose is givenunknown2003-08-271-1/+1
| | | | | | | | | | | | and --defaults-file is a non-existing or non-regular file. Bug#755 scripts/mysqld_safe.sh: Added a warning to my_print_defaults if --verbose is given and --defaults-file is a non-existing or non-regular file. Bug#755
* - removed options sort_buffer and key_buffer from calls to (my)isamchkunknown2003-07-151-4/+8
| | | | | | | | | in mysqld_safe (commented out by default), to not override any options defined in my.cnf (thanks to Axel Schwenke from Jobpilot.de for the suggestion)
* Added option --skip-kill-mysqld to mysqld_safe. This can be useful,unknown2003-06-141-1/+7
| | | | | | | | | if one is running many mysqlds through mysqld_multi, for example. Without this option, on Linux one mysqld_safe process may kill other mysqlds as well, if started using the same binary and path.
* - applied patch for mysqld_safe from Christian Hammers to be able tounknown2003-06-121-3/+12
| | | | | | | | | define a different niceness level in my.cnf (Bug #627) scripts/mysqld_safe.sh: - applied patch from Christian Hammers to be able to define a different niceness level in my.cnf (Bug #627)
* - added missing dashes to parameter "open-files-limit" in mysqld_safeunknown2003-04-151-1/+1
| | | | | | | (bug #264)
* mergedunknown2003-03-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | man/perror.1: Auto merged scripts/mysqld_safe.sh: Auto merged sql/gen_lex_hash.cc: Auto merged sql/ha_myisam.cc: Auto merged sql/item.cc: Auto merged sql/sql_select.cc: Auto merged strings/ctype-tis620.c: Auto merged mysql-test/r/analyse.result: ul mysql-test/r/group_by.result: ul mysql-test/r/select.result: ul
* Merge with 3.23 to get fixes for --user and BACKUP TABLEunknown2003-03-101-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-delete.result: Delete: mysql-test/r/delete.result BitKeeper/deleted/.del-stamp-h.in~4a5d6676232516c5: Auto merged client/mysqlbinlog.cc: Auto merged include/my_sys.h: Auto merged libmysql/libmysql.c: Auto merged mysql-test/t/delete.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysys/my_copy.c: Auto merged sql/field.h: Auto merged sql/opt_range.cc: Auto merged sql/share/polish/errmsg.txt: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.cc: Auto merged mysql-test/mysql-test-run.sh: merge with 3.23.56 mysql-test/r/backup.result: merge (needs to be updated) mysql-test/r/join.result: merge (needs to be updated) mysql-test/r/type_datetime.result: merge (needs to be updated) mysql-test/t/backup.test: merge with 3.23 scripts/mysqld_safe.sh: Only use first --user option sql/ha_myisam.cc: Don't let BACKUP TABLE overwrite old files sql/log_event.h: merge sql/mysql_priv.h: merge sql/mysqld.cc: Use first --user option sql/slave.cc: use local version sql/sql_repl.h: use local version
* Patch for novellunknown2003-02-161-1/+1
| | | | | | | | | | | Reverted wrong patch for mysqld_safe.sh client/mysqldump.c: Patch for novell. scripts/mysqld_safe.sh: Reverted wrong patch. (We must delete the files first as otherwise we will get a problem if the files has the wrong permissions or if the machine went down without removing the socket file)
* Fixed a bug in mysqld_safe, when it earlier could have removedunknown2003-02-121-2/+1
| | | | | | | a socket from another, still living MySQL server.
* Only write to the error log if --log-error is specified and --console is not ↵unknown2003-01-281-1/+3
| | | | | | | | | | | | | | | | | | | | | specified (On Windows --log-error is enabled by default) mysys/my_getopt.c: Call get_one_option() also for boolean values. scripts/mysqld_safe.sh: Add option --log-error sql/log.cc: Fix for --log-error sql/mysql_priv.h: Fix for --log-error sql/mysqld.cc: Fix for --log-error sql/sql_udf.cc: Lock the mysql/func table properly
* Merge sinisa@work.mysql.com:/home/bk/mysql-4.0unknown2003-01-211-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | into sinisa.nasamreza.org:/mnt/work/mysql-4.0 scripts/mysqld_safe.sh: Auto merged sql/net_pkg.cc: Auto merged sql/sql_acl.cc: Auto merged
| * Merge with 3.23unknown2003-01-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | innobase/btr/btr0btr.c: Auto merged ltconfig: Auto merged innobase/include/btr0btr.h: Auto merged innobase/log/log0log.c: Auto merged libmysql/Makefile.shared: Auto merged man/isamlog.1: Auto merged man/mysql.1: Auto merged man/mysql_zap.1: Auto merged man/isamchk.1: Auto merged man/mysqlaccess.1: Auto merged man/mysqladmin.1: Auto merged man/mysqld_multi.1: Auto merged man/mysqld.1: Auto merged man/mysqld_safe.1: Auto merged man/mysqldump.1: Auto merged man/mysqlshow.1: Auto merged man/replace.1: Auto merged myisam/mi_unique.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/net_pkg.cc: Auto merged sql/sql_table.cc: Auto merged strings/Makefile.am: Auto merged man/perror.1: Auto merged Makefile.am: merge with 3.23 client/mysqltest.c: merge with 3.23 innobase/btr/btr0pcur.c: merge with 3.23 (use local file) innobase/row/row0purge.c: merge with 3.23 (use local file) scripts/mysql_fix_privilege_tables.sh: Merge with 3.23 (Apply debian patches) sql/ha_innodb.cc: merge with 3.23 (use local file) sql/mysqld.cc: Merge with 3.23 (use local file) sql/net_serv.cc: Merge with 3.23 (use local file) sql/sql_db.cc: Merge with 3.23 (use local file)
* | A small fix for the type in the scriptunknown2003-01-091-1/+1
|/
* Fixed that NULL and 0 returns 0 instead of NULLunknown2002-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL mysql-test/r/bdb.result: Fix results after serges last patch mysql-test/r/innodb.result: Fix results after serges last patch mysql-test/r/null.result: Update for new AND handling of NULL scripts/mysqld_safe.sh: Fix 'isroot' test to work even if user is not root sql/item.h: Fixed that NULL and 0 returns 0 instead of NULL sql/item_cmpfunc.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/item_cmpfunc.h: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_base.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_parse.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_select.cc: Fixed that NULL and 0 returns 0 instead of NULL sql/sql_yacc.yy: Fixed that NULL and 0 returns 0 instead of NULL
* fixed test for "root", on some installations / is mounted read-onlyunknown2002-11-081-1/+1
|
* Added --skip-safemalloc to mysqltestunknown2002-10-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x Small change in EXCHANGE output Propagate open-files-limit from mysqld_safe -> mysqld Fixed speed bug in GROUP BY Added quotes around database name in CREATE DATABASE db_name (for binary log) BitKeeper/etc/ignore: added stamp-h1 Docs/manual.texi: Added 4.1 manual section Updated changelog client/mysqltest.c: Added --skip-safemalloc include/my_global.h: Added bug fix from 3.23 for AIX 4.3.3 and gcc 3.x mysql-test/mysql-test-run.sh: Start mysqltest with --skip-safemalloc (To get it faster) mysql-test/r/bdb.result: Update for new EXPLAIN output mysql-test/r/compare.result: Update for new EXPLAIN output mysql-test/r/create.result: Update for new EXPLAIN output mysql-test/r/distinct.result: Update for new EXPLAIN output mysql-test/r/explain.result: Update for new EXPLAIN output mysql-test/r/group_by.result: Update for new EXPLAIN output mysql-test/r/heap.result: Update for new EXPLAIN output mysql-test/r/innodb.result: Update for new EXPLAIN output mysql-test/r/join_outer.result: Update for new EXPLAIN output mysql-test/r/key_diff.result: Update for new EXPLAIN output mysql-test/r/merge.result: Update for new EXPLAIN output mysql-test/r/null_key.result: Update for new EXPLAIN output mysql-test/r/order_by.result: Update for new EXPLAIN output mysql-test/r/select.result: Update for new EXPLAIN output mysql-test/r/temp_table.result: Fixed speed bug in GROUP BY mysql-test/r/type_datetime.result: Update for new EXPLAIN output mysql-test/r/user_var.result: Update for new EXPLAIN output mysql-test/r/variables.result: Removed variable safe_show_database mysql-test/t/temp_table.test: Fixed speed bug in GROUP BY mysql-test/t/variables.test: Removed not used variable safe_show_databases scripts/mysqld_safe.sh: Propagate open-files-limit from mysqld_safe -> mysqld sql/mysqld.cc: Removed variable safe_show_database sql/set_var.cc: Removed variable safe_show_database sql/slave.cc: Updated error message sql/sql_db.cc: Added quotes around database name in CREATE DATABASE db_name sql/sql_select.cc: Fixed speed bug in GROUP BY
* a fix for the typo in the last pushunknown2002-10-071-1/+1
|
* a small fix for some shellsunknown2002-10-051-2/+2
|
* mergeunknown2002-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union Build-tools/Do-all-build-steps: Auto merged Build-tools/Do-compile: Auto merged Build-tools/Do-rpm: Auto merged Docs/manual.texi: Auto merged include/hash.h: Auto merged include/my_sys.h: Auto merged innobase/dict/dict0dict.c: Auto merged libmysql/libmysql.c: Auto merged mysql-test/t/type_date.test: Auto merged mysys/array.c: Auto merged mysys/hash.c: Auto merged mysys/mf_qsort.c: Auto merged scripts/mysqld_safe.sh: Auto merged scripts/mysqlhotcopy.sh: Auto merged sql/item_timefunc.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql-bench/server-cfg.sh: Auto merged strings/Makefile.am: Auto merged
* Fix the NOHUP_NICENESS test in mysqld_safe.unknown2001-10-221-8/+41
| | | | | | scripts/mysqld_safe.sh: Fix the NOHUP_NICENESS test; previously it would break if the process already had a negative priority.
* mergeunknown2001-09-021-2/+6
| | | | | | | | | configure.in: Auto merged Docs/manual.texi: Auto merged myisam/mi_create.c: Auto merged
View Lorry Controller Status