Recognize the --no-defaults, --defaults-file and --defaults-extra-file
options. Treat old --config-file argument as if --defaults-extra-file
had been specified instead.
Plus a few other defaults-related cleanups.
extra/my_print_defaults.c:
Make help text more accurate regarding how --config-file, --defaults-file, and --defaults-extra-file should be used. Flag --config-file as deprecated.
mysys/default.c:
Always print a newline after listing the default files, even if
--defaults-file= was set (in my_print_default_files()).
scripts/mysqld_multi.sh:
Recognize --no-defaults, --defaults-file and --defaults-extra-file options.
Treat old --config-file argument as if --defaults-extra-file had been specified
instead.
Improve find_groups() method, to honor --defaults-file, etc.
A few random drive-by cleanups, while I'm here.
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
into siva.hindu.god:/usr/home/tim/m/bk/50
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_class.h:
Auto merged
bug #25104
mysys/default.c:
Added /etc/mysql to the search path after /etc.
scripts/mysqld_multi.sh:
Added /etc/mysql to the my.cnf search path.
Changed chop to chomp - since it's smarter.
scripts/Makefile.am:
pass --sysconfdir to scripts
scripts/mysqlaccess.sh:
use --sysconfdir instead of hardcoded /etc
scripts/mysqld_multi.sh:
use --sysconfdir instead of hardcoded /etc
Currently failing tests (for me) in non-debug build:
blackhole fulltext fulltext_cache fulltext_left_join fulltext_multi
scripts/mysqld_multi.sh:
Auto merged
extra/comp_err.c:
Manual merge: From 4.1 to 5.0, the license line was moved to a different place.
Copyright string fixes (bug#16106)
extra/comp_err.c:
Ensure that the license spelling is as expected by the "mysql_copyright" tool.
(bug#16106)
scripts/mysqld_multi.sh:
The "mysql_copyright" tool will not change non-C files, so do not mention the license.
(bug#16106)
into mysql.com:/home/jimw/my/mysql-5.0-clean
mysql-test/t/variables.test:
Auto merged
sql/set_var.cc:
Auto merged
mysql-test/r/variables.result:
Resolve conflict
scripts/mysqld_multi.sh:
Resolve conflict
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.
- Made some of the warnings under --verbose only
- Added possibility to add mysqladmin= under groups [mysqldN]
mysqladmin=... is no longer mandatory under [mysqld_multi]
- Made 'start', 'stop' and 'report' commands truly case-insensitive
- Some other common places code merge and cleanup
binary for mysqld_multi was not found. This is because it is
possible to define one under each mysqldN group separately.
Bailing out if mysqld binary is not found at all.
Added option --silent to turn off warnings.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
innobase/dict/dict0boot.c:
Auto merged
innobase/dict/dict0load.c:
Auto merged
innobase/dict/dict0mem.c:
Auto merged
innobase/fut/fut0lst.c:
Auto merged
innobase/include/buf0lru.h:
Auto merged
innobase/include/dict0mem.h:
Auto merged
innobase/include/fsp0fsp.h:
Auto merged
innobase/include/ha0ha.h:
Auto merged
innobase/include/ibuf0ibuf.h:
Auto merged
innobase/include/lock0lock.h:
Auto merged
innobase/include/log0log.h:
Auto merged
innobase/include/mem0pool.h:
Auto merged
innobase/include/mtr0mtr.h:
Auto merged
innobase/include/os0file.h:
Auto merged
innobase/include/rem0rec.h:
Auto merged
innobase/include/rem0rec.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/include/sync0sync.h:
Auto merged
innobase/include/trx0sys.h:
Auto merged
innobase/include/ut0byte.h:
Auto merged
innobase/include/ut0ut.h:
Auto merged
innobase/mem/mem0pool.c:
Auto merged
innobase/mtr/mtr0mtr.c:
Auto merged
innobase/os/os0proc.c:
Auto merged
innobase/pars/lexyy.c:
Auto merged
innobase/pars/pars0opt.c:
Auto merged
innobase/row/row0ins.c:
Auto merged
innobase/row/row0purge.c:
Auto merged
innobase/row/row0uins.c:
Auto merged
innobase/row/row0umod.c:
Auto merged
innobase/row/row0undo.c:
Auto merged
innobase/row/row0upd.c:
Auto merged
innobase/trx/trx0purge.c:
Auto merged
innobase/trx/trx0roll.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0undo.c:
Auto merged
innobase/ut/ut0byte.c:
Auto merged
pstack/bucomm.h:
Auto merged
pstack/budbg.h:
Auto merged
sql/item_sum.h:
Auto merged
sql/slave.cc:
Auto merged
sql/sql_db.cc:
Auto merged
support-files/mysql.spec.sh:
Auto merged
tests/insert_test.c:
Auto merged
mysql-test/t/func_group.test:
Merge with 4.0
Put 4.1 tests lasts
sql/ha_innodb.cc:
Merge with 4.0
Added checking of results from my_malloc()
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
- Changed reading of config file so that one can use a separate config
file for [mysqld_multi] also. In other words --config-file=file will
read group [mysqld_multi] from this file, earlier it wouldn't have.
if doesn't exists or is not writable, then /var/log/mysqld_multi.log, if does not exists
or is not writable, then /tmp/mysqld_multi.log, but only in case the file does not yet
exists in /tmp. Otherwise log will be disabled, unless user explicitely sets it with an
option.
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
client/mysqlcheck.c:
Fixed three bugs in mysqlcheck:
1. mysqlcheck died with error Got error: 1103: Incorrect table name when
executing 'REPAIR TABLE'
2. --auto-repair used together with --all-in-1 (-1) tried to fix next table
in a row, independent whether the next table was OK or corrupted, in case an
error was found from a previous table and the previous table remained unfixed.
3. --auto-repair didn't work at all when -1 option wasn't used; broken tables
were not noticed at all.
scripts/mysqld_multi.sh:
Changed documentation
Fixed bug with ALTER TABLE on HEAP tables
mysql-test/r/alter_table.result:
Turn off SCCS flag
mysql-test/r/analyse.result:
Turn off SCCS flag
mysql-test/r/auto_increment.result:
Turn off SCCS flag
mysql-test/r/bdb.result:
Turn off SCCS flag
mysql-test/r/bigint.result:
Turn off SCCS flag
mysql-test/r/binary.result:
Turn off SCCS flag
mysql-test/r/case.result:
Turn off SCCS flag
mysql-test/r/comments.result:
Turn off SCCS flag
mysql-test/r/compare.result:
Turn off SCCS flag
mysql-test/r/count_distinct.result:
Turn off SCCS flag
mysql-test/r/create.result:
Turn off SCCS flag
mysql-test/r/delayed.result:
Turn off SCCS flag
mysql-test/r/distinct.result:
Turn off SCCS flag
mysql-test/r/empty_table.result:
Turn off SCCS flag
mysql-test/r/explain.result:
Turn off SCCS flag
mysql-test/r/ft0000001.a.result:
Turn off SCCS flag
mysql-test/r/ft0000001.b.result:
Turn off SCCS flag
mysql-test/r/ft0000001.c.result:
Turn off SCCS flag
mysql-test/r/ft0000001.d.result:
Turn off SCCS flag
mysql-test/r/ft0000001.e.result:
Turn off SCCS flag
mysql-test/r/ft0000002.a.result:
Turn off SCCS flag
mysql-test/r/ft0000002.b.result:
Turn off SCCS flag
mysql-test/r/ft0000002.c.result:
Turn off SCCS flag
mysql-test/r/fulltext.result:
Turn off SCCS flag
mysql-test/r/func_crypt.result:
Turn off SCCS flag
mysql-test/r/func_date_add.result:
Turn off SCCS flag
mysql-test/r/func_equal.result:
Turn off SCCS flag
mysql-test/r/func_group.result:
Turn off SCCS flag
mysql-test/r/func_in.result:
Turn off SCCS flag
mysql-test/r/func_like.result:
Turn off SCCS flag
mysql-test/r/func_math.result:
Turn off SCCS flag
mysql-test/r/func_misc.result:
Turn off SCCS flag
mysql-test/r/func_op.result:
Turn off SCCS flag
mysql-test/r/func_regexp.result:
Turn off SCCS flag
mysql-test/r/func_set.result:
Turn off SCCS flag
mysql-test/r/func_str.result:
Turn off SCCS flag
mysql-test/r/func_system.result:
Turn off SCCS flag
mysql-test/r/func_test.result:
Turn off SCCS flag
mysql-test/r/func_time.result:
Turn off SCCS flag
mysql-test/r/group_by.result:
Turn off SCCS flag
mysql-test/r/heap.result:
Turn off SCCS flag
mysql-test/r/ins000001.result:
Turn off SCCS flag
mysql-test/r/insert.result:
Turn off SCCS flag
mysql-test/r/insert_select.result:
Turn off SCCS flag
mysql-test/r/join.result:
Turn off SCCS flag
mysql-test/r/join_outer.result:
Turn off SCCS flag
mysql-test/r/key.result:
Turn off SCCS flag
mysql-test/r/key_diff.result:
Turn off SCCS flag
mysql-test/r/key_primary.result:
Turn off SCCS flag
mysql-test/r/keywords.result:
Turn off SCCS flag
mysql-test/r/limit.result:
Turn off SCCS flag
mysql-test/r/merge.result:
Turn off SCCS flag
mysql-test/r/null.result:
Turn off SCCS flag
mysql-test/r/null_key.result:
Turn off SCCS flag
mysql-test/r/odbc.result:
Turn off SCCS flag
mysql-test/r/order_by.result:
Turn off SCCS flag
mysql-test/r/raid.result:
Turn off SCCS flag
mysql-test/r/range.result:
Turn off SCCS flag
mysql-test/r/rename.result:
Turn off SCCS flag
mysql-test/r/replace.result:
Turn off SCCS flag
mysql-test/r/rollback.result:
Turn off SCCS flag
mysql-test/r/rpl000001.a.result:
Turn off SCCS flag
mysql-test/r/rpl000001.b.result:
Turn off SCCS flag
mysql-test/r/rpl000002.result:
Turn off SCCS flag
mysql-test/r/rpl000003.result:
Turn off SCCS flag
mysql-test/r/rpl000004.a.result:
Turn off SCCS flag
mysql-test/r/rpl000004.b.result:
Turn off SCCS flag
mysql-test/r/rpl000005.result:
Turn off SCCS flag
mysql-test/r/rpl000006.result:
Turn off SCCS flag
mysql-test/r/rpl000007.result:
Turn off SCCS flag
mysql-test/r/rpl000008.result:
Turn off SCCS flag
mysql-test/r/rpl000009.result:
Turn off SCCS flag
mysql-test/r/rpl000010.result:
Turn off SCCS flag
mysql-test/r/rpl000011.result:
Turn off SCCS flag
mysql-test/r/rpl000012.result:
Turn off SCCS flag
mysql-test/r/rpl000012.status.result:
Turn off SCCS flag
mysql-test/r/rpl000013.result:
Turn off SCCS flag
mysql-test/r/rpl000013.status.result:
Turn off SCCS flag
mysql-test/r/rpl000014.result:
Turn off SCCS flag
mysql-test/r/rpl000015.result:
Turn off SCCS flag
mysql-test/r/rpl000016.result:
Turn off SCCS flag
mysql-test/r/sel000001.result:
Turn off SCCS flag
mysql-test/r/sel000002.result:
Turn off SCCS flag
mysql-test/r/sel000003.result:
Turn off SCCS flag
mysql-test/r/sel000031.result:
Turn off SCCS flag
mysql-test/r/sel000032.result:
Turn off SCCS flag
mysql-test/r/sel000033.result:
Turn off SCCS flag
mysql-test/r/sel000100.result:
Turn off SCCS flag
mysql-test/r/select_safe.result:
Turn off SCCS flag
mysql-test/r/show_check.result:
Turn off SCCS flag
mysql-test/r/shw000001.result:
Turn off SCCS flag
mysql-test/r/slave-running.result:
Turn off SCCS flag
mysql-test/r/slave-stopped.result:
Turn off SCCS flag
mysql-test/r/tablelock.result:
Turn off SCCS flag
mysql-test/r/temp_table.result:
Turn off SCCS flag
mysql-test/r/truncate.result:
Turn off SCCS flag
mysql-test/r/type_blob.result:
Turn off SCCS flag
mysql-test/r/type_date.result:
Turn off SCCS flag
mysql-test/r/type_datetime.result:
Turn off SCCS flag
mysql-test/r/type_enum.result:
Turn off SCCS flag
mysql-test/r/type_float.result:
Turn off SCCS flag
mysql-test/r/type_ranges.result:
Turn off SCCS flag
mysql-test/r/type_time.result:
Turn off SCCS flag
mysql-test/r/type_timestamp.result:
Turn off SCCS flag
mysql-test/r/type_uint.result:
Turn off SCCS flag
mysql-test/r/type_year.result:
Turn off SCCS flag
mysql-test/r/update.result:
Turn off SCCS flag
mysql-test/r/varbinary.result:
Turn off SCCS flag
mysql-test/r/variables.result:
Turn off SCCS flag
Docs/manual.texi:
Changelog
client/my_readline.h:
Added read length to readline()
client/mysql.cc:
cleanup
client/mysqladmin.c:
cleanup
client/mysqldump.c:
Added handling of hexadecimal constants
client/mysqlimport.c:
Version change
client/mysqltest.c:
Don't append the .reject extension, instead replace the old extension
client/readline.cc:
Added read length to readline()
heap/hp_open.c:
extra debug
merge/rrnd.c:
Fix bug in merge tables
mysql-test/install_test_db.sh:
Portability fixes
mysql-test/mysql-test-run.sh:
Portability fixes
Added --ddd and --debug options
scripts/mysqld_multi.sh:
Add pathname to mysqladmin
sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha:
New benchmark results
sql/mysqld.cc:
Some fixes for gemini
sql/sql_table.cc:
Fixed bug with ALTER TABLE on HEAP tables
Docs/manual.texi:
Changed name mysql_multi_mysqld to mysqld_multi.
This is because safe_mysqld will be converted to mysqld_safe
in the future and the new name is shorter than the old one.
scripts/Makefile.am:
Added mysqld_multi
scripts/mysqld_multi.sh:
Changed name from mysql_multi_mysqld to mysqld_multi
2000-12-07 15:57:58 +02:00
Renamed from scripts/mysql_multi_mysqld (Browse further)
