-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MDEV-14978] Client programs to use $MYSQL_HOST consistently
Only `mysql` client program was using $MYSQL_HOST as the default host. Add the same feature in most other client programs. 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.
- Loading branch information
1 parent
090e5d8
commit 138e8bf
Showing
9 changed files
with
126 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
CREATE DATABASE env_variable; | ||
USE env_variable; | ||
CREATE TABLE pet (name VARCHAR(20)); | ||
show binary logs; | ||
Log_name File_size | ||
master-bin.000001 635 | ||
+----+------+-----------+--------------+---------+------+----------+------------------+----------+ | ||
| Id | User | Host | db | Command | Time | State | Info | Progress | | ||
+----+------+-----------+--------------+---------+------+----------+------------------+----------+ | ||
| 5 | root | localhost | env_variable | Sleep | 0 | | | 0.000 | | ||
| 6 | root | localhost | | Query | 0 | starting | show processlist | 0.000 | | ||
+----+------+-----------+--------------+---------+------+----------+------------------+----------+ | ||
env_variable.pet OK | ||
env_variable.pet: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0 | ||
Database: env_variable | ||
+--------+ | ||
| Tables | | ||
+--------+ | ||
| pet | | ||
+--------+ | ||
**************** | ||
# Setting MYSQL_HOST environment variable | ||
Done | ||
DROP DATABASE env_variable; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
-- source include/have_log_bin.inc | ||
|
||
# Set up environment varibles for client programs | ||
--let MYSQLADMIN = $MYSQL_BINDIR/client//mariadb-admin | ||
--let MYSQLBINLOG = $MYSQL_BINDIR/client//mariadb-binlog | ||
--let MYSQLCHECK = $MYSQL_BINDIR/client//mariadb-check | ||
--let MYSQLDUMP = $MYSQL_BINDIR/client//mariadb-dump | ||
--let MYSQLIMPORT = $MYSQL_BINDIR/client//mariadb-import | ||
--let MYSQLSHOW = $MYSQL_BINDIR/client//mariadb-show | ||
--let MYSQLSLAP = $MYSQL_BINDIR/client//mariadb-slap | ||
|
||
# Creating a database for the client programs | ||
CREATE DATABASE env_variable; | ||
USE env_variable; | ||
CREATE TABLE pet (name VARCHAR(20)); | ||
show binary logs; | ||
|
||
# Creating a data file for mysqlimport | ||
write_file $MYSQL_TMP_DIR/pet; | ||
buster | ||
bob | ||
EOF | ||
|
||
# Options for client program | ||
--let $options = --user=root --port=16000 --socket=$MYSQL_TMP_DIR/mysqld.1.sock | ||
|
||
# Run client programs using the default `localhost` | ||
--exec $MYSQLADMIN $options processlist | ||
--exec $MYSQLBINLOG $options --read-from-remote-server master-bin.000001 > /dev/null 2>&1 | ||
--exec $MYSQLCHECK $options -c --databases env_variable | ||
--exec $MYSQLDUMP $options env_variable > $MYSQL_TMP_DIR/tmp.sql | ||
--exec $MYSQLIMPORT $options env_variable --local $MYSQL_TMP_DIR/pet | ||
--exec $MYSQLSHOW $options env_variable | ||
--exec $MYSQLSLAP $options > /dev/null 2>&1 | ||
|
||
--echo **************** | ||
--echo # Setting MYSQL_HOST environment variable | ||
--let MYSQL_HOST=nonexistent-sever | ||
|
||
# Now run the same command as before with MYSQL_HOST environment variable | ||
# Client programs are expected to fail since the server does not exist | ||
# Some client program fails with error 1 and some fails wtih error 2 | ||
|
||
--error 1 | ||
--exec $MYSQLADMIN $options processlist | ||
|
||
--error 1 | ||
--exec $MYSQLBINLOG $options --read-from-remote-server master-bin.000001 > /dev/null 2>&1 | ||
|
||
--error 2 | ||
--exec $MYSQLCHECK $options -c --databases env_variable | ||
|
||
--error 2 | ||
--exec $MYSQLDUMP $options env_variable > $MYSQL_TMP_DIR/tmp.sql | ||
|
||
--error 1 | ||
--exec $MYSQLIMPORT $options env_variable $MYSQL_TMP_DIR/pet | ||
|
||
--error 1 | ||
--exec $MYSQLSLAP $options > /dev/null 2>&1 | ||
|
||
# Clean up | ||
--echo Done | ||
DROP DATABASE env_variable; | ||
|