The mysqld server and all clients now reads the new client-server section
Fixed that mysqldumpslow supports new slow log formats and new mysqld --slow- options
client/mysql.cc:
Read also client-server and client-mariadb sections.
client/mysql_upgrade.c:
Read also client-server and client-mariadb sections.
client/mysqladmin.cc:
Read also client-server and client-mariadb sections.
client/mysqlbinlog.cc:
Read also client-server and client-mariadb sections.
client/mysqlcheck.c:
Read also client-server and client-mariadb sections.
client/mysqldump.c:
Read also client-server and client-mariadb sections.
client/mysqlimport.c:
Read also client-server and client-mariadb sections.
client/mysqlshow.c:
Read also client-server and client-mariadb sections.
client/mysqltest.cc:
Read also client-server and client-mariadb sections.
extra/my_print_defaults.c:
Updated help text
scripts/mysql_fix_privilege_tables.sh:
Read also sections client client-server client-mariadb
scripts/mysql_install_db.pl.in:
Also allow --data=* option
Read also groups mariadb, server and client-server.
scripts/mysql_install_db.sh:
Also allow --data=* option
Read also groups mariadb, server and client-server.
Added --lose-skip-pbxt to bootstrap
scripts/mysql_secure_installation.sh:
Read also groups client-server and client-mariadb
scripts/mysqld_multi.sh:
Read also group mariadb
scripts/mysqld_safe.sh:
Read also groups mariadb server and client-server
scripts/mysqldumpslow.sh:
Fixed to support new slow log formats
Added sorting on -ae (aggregated number of retreived rows) and e (retrieved rows)
Read also group 'mariadb'
If there is many instances of same option, use last one.
Get slow log file from options log-slow-queries=filename or query-log-file=filename
Added support for future --log-basename option
sql-common/client.c:
Read also groups 'client-server' and 'client-mariadb'
tests/mysql_client_test.c:
Read also groups 'client-server' and 'client-mariadb'
tests/thread_test.c:
Read also groups 'client-server' and 'client-mariadb'
Several items said to be deprecated in the 4.1 manual
have never been removed. This worklog adds deprecation
warnings when these items are used, and warns the user
that the items will be removed in MySQL 5.6.
A couple of previously deprecation decision have been
reversed (see single file comments)
client/client_priv.h:
Macro similar to the one in the server (mysql_priv.h)
for printing a deprecation warning message
client/mysql.cc:
no-auto-rehash will not be deprecated
skip-line-numbers will not be deprecated
skip-column-names will not be deprecated
no-pager is deprecated
set-variable is deprecated
no-named-commands is deprecated
client/mysqladmin.cc:
set-variable is deprecated
client/mysqlbinlog.cc:
position is deprecated
client/mysqldump.c:
first-slave is deprecated
no-set-names is deprecated
set-variable is deprecated
mysql-test/r/mysqlbinlog.result:
Adding the [Warning] to the test case, just to show that the
deprecation works.
The test case will be changed in Celosia to use --start-position.
mysys/my_getopt.c:
set-variable (include -O) is deprecated
scripts/mysqld_multi.sh:
Warning for mysqld_multi
sql/mysqld.cc:
default-collation is deprecated
log-bin-trust-routine-creators is deprecated
set-variable is deprecated
default-character-set is deprecated
safe-show-database is deprecated
sql/share/errmsg.txt:
Added version number for sql_log_update deprecation message.
occasionally.
mysql_multi can call mysqld_safe. In doing this it's not changing the
current working directory. This may cause confusion in the case where
mysqld_multi is handling instances of servers of different versions
and the current working directory is the installation directory of one
of these servers.
Fixed by enhancing the meaning of basedir in [mysqldN] sections of
mysqld_multi. If specified, mysqld_multi will change the current
working directory to the basedir directory before starting the server
in mysqld_multi ... start ... and then change it back to what it was.
scripts/mysqld_multi.sh:
Bug #36654: optionally preserve, change and restore the cwd when
starting server instances
Bug#32136: mysqld_multi --defaults-file not respected while using \
--mysqld=mysqld_safe
Revert change that adds "--no-defaults" to mysqld_multi.
This closes Bug#43508 and re-opens Bug#32136.
--mysqld=mysqld_safe
The server run didn't know the correct section to read in a
configuration file, and would read from "[mysqld]" even though
mysqld_multi had already read the defaults and made them into explicit
parameters.
Worse, the "defaults-file" parameter says that it means "Read only
this configuration file, do not read the standard system-wide and
user-specific files", which should apply not only to mysql-multi, but
to the server also.
So, now if "defaults-file" is given, put "no-defaults" before all the
explicit parameters we read from the defaults-file and feed to the
mysqld or mysqld_safe.
Better Windows support in the scripts directory
mysql_config.pl.in, mysql_install_db.pl.in:
New Perl version of Unix shell script, mainly for Windows
Many files in scripts directory:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
extra/CMakeLists.txt:
Added target for executable "resolveip"
extra/resolveip.c:
Exclude Unix specific headers when compiling on Windows
scripts/CMakeLists.txt:
On Windows, filter Perl scripts and change name from ".sh" to ".pl"
mysql_convert_table_format.sh mysql_explain_log.sh
mysql_secure_installation.sh mysql_tableinfo.sh
mysqld_multi.sh mysqldumpslow.sh
mysqlhotcopy.sh
Do the same for the new Windows specific Perl versions of shell scripts
mysql_config.pl.in mysql_install_db.pl.in
In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on.
scripts/Makefile.am:
Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR
scripts/make_win_bin_dist:
Only include explicitly listed scripts from the "scripts" directory
scripts/mysql_convert_table_format.sh:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_explain_log.sh:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_tableinfo.sh:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqld_multi.sh:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqldumpslow.sh:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysqlhotcopy.sh:
Use default Perl location "#!/usr/bin/perl" instead of the build host path
scripts/mysql_config.pl.in:
New Perl version of Unix shell script, mainly for Windows
scripts/mysql_install_db.pl.in:
New Perl version of Unix shell script, mainly for Windows
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
