Continue the effort of a previous commit (PR#2114) which changed the man
pages titles from MariaDB to MySQL, to further update the man pages.
Update the man page NAME sections to use mariadb-* instead of mysql* for
MariaDB binaries that are drop-in replacements for MySQL equivalents,
indicating that the commands are actually of the MariaDB version.
Before:
NAME
mysql_upgrade - check tables for MariaDB upgrade
...
After:
NAME
mariadb-upgrade - check tables for MariaDB upgrade (mysql_upgrade
is now a symlink to mariadb-upgrade)
...
All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
When reading the man page of e.g. 'mysql' on a system with MariaDB
installed one would actually see the man page of 'mariadb'. However the
man page had no indication of the page being for 'mariadb', which was
confusing for users.
Fix this by updating the man page title lines to use mariadb-* instead
of mysql* for MariaDB binaries that are drop-in replacements for MySQL
equivalents, indicating that the commands are actually of the MariaDB
version.
In long term, all the commands in man pages should be replaced by their
MariaDB counterparts. Update the title lines as a start, and only those
that exist as symlinks to their MariaDB counterparts.
Before:
man mariadb-upgrade | head -n 1
MYSQL_UPGRADE(1) ...
After:
man mariadb-upgrade | head -n 1
MARIADB-UPGRADE(1) ...
All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
Problem:
=======
MariaDB's command line utilities (e.g., mysql,
mysqldump, etc) silently ignore connection
property options (e.g., --port and --socket)
when protocol is not explicitly set via the
command-line for localhost connections.
Fix:
===
If connection properties are specified without a
protocol, override the protocol to be consistent.
For example, if --port is specified, automatically
set protocol=tcp.
Caveats:
=======
* When multiple connection properties are
specified, nothing is overridden
* If protocol is is set via the command-line,
its value is used
Reviewers:
========
Sergei Golubchik <serg@mariadb.com>
Vladislav Vaintroub <wlad@mariadb.com>
manpage) turned out as a major overhaul of all man pages:
- renamed all *.1 files to *.1.in to act as templates which are being
processed at build time
- replaced some hard-coded values with place holder that are being
replaced with the proper values at build time
- Updated list of available man pages in the SEE ALSO section and added a
hint to the manual for more details
- Added a BUGS section to all pages, referring to the bugs DB
- Updated some obsolete URLs and mail addresses
The actual content of these man pages should probably be cross-checked for
correctness, though...
man/Makefile.am:
- Replace some hard-coded values in the man pages with the proper values
at build time instead. Instead of the *.1 files, we now add the *.1.in
files (the templates) to the source distribution and generate the *.1
files during make.
man/isamchk.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/isamlog.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysql_fix_privilege_tables.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysql_zap.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqlaccess.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqladmin.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqld.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqld_multi.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqld_safe.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqldump.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysqlshow.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/perror.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/replace.1.in:
- replaced some hard-coded values (e.g. Version numbers) with variables
which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
man/mysql.1.in:
- replaced some hard-coded values (e.g. Version numbers, path names) with
variables which are replaced with the proper values at build time
- Updated list of other man pages listed in SEE ALSO
- Added BUGS section, referring to the bugs database
- Updated URL and Mail address
(thanks to Christian Hammers from the Debian project for providing it)
- Updated version number in man pages (3.23 -> 4.0)
man/Makefile.am:
- added mysql_fix_privilege_tables(1) man page to man_MANS
man/isamchk.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/isamlog.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysql.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysql_zap.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqlaccess.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqladmin.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld_multi.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqld_safe.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqldump.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/mysqlshow.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/perror.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
man/replace.1:
- Updated version number ("MySQL-3.23" -> "MySQL 4.0")
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)
for the Debian project) to fix some architecture-specific problems
and some bugs
Makefile.am:
- put current directory (.) at front of SUBDIRS list, so that "distclean"
is done last. IF done first, "distclean" in include directory fails
because config.h is missing, which is removed by distclean in current
directory. (thanks to "jww" for the patch)
- make "distclean" in libmysql_r, too (Thanks to Christian Hammers from the
Debian project for the patch)
bdb/dist/aclocal/mutex.m4:
- Sparc patch for mutexes/pthreads from Christopher C. Chimelis and
Ben Collins from Debian (thanks to Christian Hammers from the Debian
project for forwarding it)
bdb/include/mutex.h:
- Patch for building on m68k architecture (originally provided
by Michael Fedrowitz for Debian Linux, thanks to Christian Hammers from
the Debian project for forwarding it)
ltconfig:
- A hardcoded "rpath" is forbidden by the Debian policy (thanks to
Christian Hammers from the Debian project for forwarding this patch)
man/isamchk.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/isamlog.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/mysql.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/mysql_zap.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/mysqlaccess.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/mysqladmin.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/mysqld.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/mysqld_multi.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/mysqldump.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
- fixed nroff mistake
man/mysqlshow.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/perror.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/replace.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
man/safe_mysqld.1:
- some syntactical correction in the headlines of the manpages for
apropos(1) (Thanks to Christian Hammers from the Debian project for
the patch)
scripts/mysql_fix_privilege_tables.sh:
- fixed some typos
- script cleanup
scripts/mysqlaccess.sh:
- make $script_log path less dependent on the shell
scripts/safe_mysqld.sh:
- applied patch provided by Debian to enhance security (This way all logs
and databases are created world-nothing).
typo/bad merge fixed
chmod a-x for man/*.1 files
man/isamchk.1:
Change mode to -rw-rw-r--
man/mysqlaccess.1:
Change mode to -rw-rw-r--
man/mysqladmin.1:
Change mode to -rw-rw-r--
man/mysqld.1:
Change mode to -rw-rw-r--
man/mysqldump.1:
Change mode to -rw-rw-r--
man/mysqlshow.1:
Change mode to -rw-rw-r--
man/perror.1:
Change mode to -rw-rw-r--
man/safe_mysqld.1:
Change mode to -rw-rw-r--
mysql-test/r/handler.result:
new tests added
client/mysqltest.c:
bug fixed: errors from handler.test (that is send_error()
after send_fields) weren't catched by expected_errno
mysql-test/t/handler.test:
typo fixed
sql/Makefile.am:
bad merge fixed
sql/sql_yacc.yy:
bad merge (?) fixed
Fixed bug in REPLACE with BDB tables
Prepare for write lock on read for BDB
Inform the handler when we want to use IGNORE / REPLACE
New manual pages
Docs/manual.texi:
Updates for BDB tables and new changes
client/mysql.cc:
Cleanup
configure.in:
Added sys/ioctl.h
heap/hp_rkey.c:
Fixed bug when reading next on not unique key
include/my_base.h:
Added new extra options
man/mysql.1:
Added example
mysys/my_write.c:
Safety fix
scripts/mysqlaccess.sh:
Removed debug output
scripts/safe_mysqld.sh:
Added --open-files-limit
sql-bench/Results/ATIS-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/RUN-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/alter-table-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/big-tables-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/connect-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/create-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/insert-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/select-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/Results/wisconsin-mysql-Linux_2.2.14_my_SMP_i686:
Updated to new benchmark
sql-bench/bench-init.pl.sh:
Updated to new benchmark
sql-bench/server-cfg.sh:
Fixes for HEAP tables
sql-bench/test-ATIS.sh:
Fix for heap tables
sql-bench/test-insert.sh:
Added some ORDER BY benchmarks to test more things
sql/ha_berkeley.cc:
Fix a bug in REPLACE
sql/ha_berkeley.h:
Fix to handle lock_on_read
sql/mysql_priv.h:
Prepare for internal subtransactions in BDB
sql/mysqld.cc:
Added -O open_files_limit=#
sql/sql_insert.cc:
Inform the handler when we want to use IGNORE / REPLACE
sql/sql_load.cc:
Inform the handler when we want to use IGNORE / REPLACE
sql/sql_parse.cc:
Cleanup
sql/sql_show.cc:
Cleanup
sql/sql_table.cc:
Inform the handler when we want to use IGNORE / REPLACE
sql/sql_update.cc:
Inform the handler when we want to use IGNORE / REPLACE
support-files/binary-configure.sh:
Better message
