|
4 | 4 | # The environment variables for client programs have default options file
|
5 | 5 | # They interfere with the MTR test so I am creating new variables for them
|
6 | 6 |
|
7 |
| ---let MARIADB = $MYSQL_BINDIR/client//mariadb |
8 |
| ---let MARIADBADMIN = $MYSQL_BINDIR/client//mariadb-admin |
9 |
| ---let MARIADBBINLOG = $MYSQL_BINDIR/client//mariadb-binlog |
10 |
| ---let MARIADBCHECK = $MYSQL_BINDIR/client//mariadb-check |
11 |
| ---let MARIADBDUMP = $MYSQL_BINDIR/client//mariadb-dump |
12 |
| ---let MARIADBIMPORT = $MYSQL_BINDIR/client//mariadb-import |
13 |
| ---let MARIADBSHOW = $MYSQL_BINDIR/client//mariadb-show |
14 |
| ---let MARIADBSLAP = $MYSQL_BINDIR/client//mariadb-slap |
| 7 | +--let MARIADBADMIN = $EXE_MYSQL-admin |
| 8 | +--let MARIADBBINLOG = $EXE_MYSQL-binlog |
| 9 | +--let MARIADBCHECK = $EXE_MYSQL-check |
| 10 | +--let MARIADBDUMP = $EXE_MYSQL-dump |
| 11 | +--let MARIADBIMPORT = $EXE_MYSQL-import |
| 12 | +--let MARIADBSHOW = $EXE_MYSQL-show |
| 13 | +--let MARIADBSLAP = $EXE_MYSQL-slap |
15 | 14 |
|
16 | 15 | # Creating a table for the client programs
|
17 | 16 | USE test;
|
|
26 | 25 | # Options for client program
|
27 | 26 | --let $options = --user=root --port=$MASTER_MYPORT --disable-ssl-verify-server-cert
|
28 | 27 |
|
29 |
| -# Check to see if environment variable is defined |
30 |
| -# MARIADB_HOST is defined in client-env-variable.cnf |
| 28 | +# Positive test for client program with MARIADB_HOST |
| 29 | +--let MARIADB_HOST=localhost |
| 30 | +--let MYSQL_HOST=nonexistent-server |
31 | 31 | --echo $MARIADB_HOST
|
32 | 32 |
|
33 |
| -# Positive test for client program with MARIADB_HOST |
34 |
| ---exec $MARIADB $options -e "SHOW DATABASES;" > /dev/null 2>&1 |
| 33 | +--exec $EXE_MYSQL $options -e "SHOW DATABASES;" > /dev/null 2>&1 |
35 | 34 | --exec $MARIADBADMIN $options processlist > /dev/null 2>&1
|
36 | 35 | --exec $MARIADBBINLOG $options --read-from-remote-server master-bin.000001 > /dev/null 2>&1
|
37 | 36 | --exec $MARIADBCHECK $options -c --databases test > /dev/null 2>&1
|
|
42 | 41 |
|
43 | 42 | #Set up negative test with invalid server
|
44 | 43 | --echo ****************
|
45 |
| ---let MARIADB_HOST=nonexistent-server |
| 44 | +--let MARIADB_HOST=255.255.255.255 |
| 45 | +--let MYSQL_HOST=localhost |
46 | 46 | --echo $MARIADB_HOST
|
47 | 47 |
|
48 | 48 | # Now run the same command as in the postive test case
|
49 | 49 | # Client programs are expected to fail since the server does not exist
|
50 | 50 | # Some client program fails with error 1 and some fails wtih error 2
|
51 | 51 |
|
52 | 52 | --error 1
|
53 |
| ---exec $MARIADB $options -e "SHOW DATABASES;" > /dev/null 2>&1 |
| 53 | +--exec $EXE_MYSQL $options -e "SHOW DATABASES;" > /dev/null 2>&1 |
54 | 54 |
|
55 | 55 | --error 1
|
56 | 56 | --exec $MARIADBADMIN $options processlist > /dev/null 2>&1
|
|
71 | 71 | --exec $MARIADBSLAP $options > /dev/null 2>&1
|
72 | 72 |
|
73 | 73 | # Run the same command but with '--host' to verify command line input overrides env variable
|
74 |
| ---exec $MARIADB $options --host localhost -e "SHOW DATABASES;" > /dev/null 2>&1 |
| 74 | +--exec $EXE_MYSQL $options --host localhost -e "SHOW DATABASES;" > /dev/null 2>&1 |
75 | 75 | --exec $MARIADBADMIN $options --host localhost processlist > /dev/null 2>&1
|
76 | 76 | --exec $MARIADBBINLOG $options --host localhost --read-from-remote-server master-bin.000001 > /dev/null 2>&1
|
77 | 77 | --exec $MARIADBCHECK $options --host localhost -c --databases test > /dev/null 2>&1
|
|
0 commit comments