percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 05:00:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-1554 Tests for ps 5.7

Browse Source
This commit is contained in:
Carlos Salguero
2018-05-26 15:07:38 -03:00
parent b79a6c621b
commit b9b152a395
15 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-mysql-summary
View File

@@ -2265,7 +2265,7 @@ report_jemalloc_enabled() {
local GENERAL_JEMALLOC_STATUS=0
local JEMALLOC_LOCATION=''
for PID in $(pidof mysqld); do
for pid in $(pidof mysqld); do
grep -qc jemalloc /proc/${pid}/environ || ldd $(which mysqld) 2>/dev/null | grep -qc jemalloc
jemalloc_status=$?
if [ $jemalloc_status = 1 ]; then

4
t/pt-mysql-summary/pt-mysql-summary_encryption.t
View File

@@ -105,7 +105,7 @@ for my $i (2..7) {
},
"t/pt-mysql-summary/samples/expected_output_temp_enc00$i.txt",
),
"--read-samples works for t/pt-mysql-summary/temp00$i",
"--read-samples works for t/pt-mysql-summary/temp_enc00$i",
) or diag($test_diff);
}
@@ -153,6 +153,8 @@ like(
"Encrypted tablespaces included in report"
) or diag $out;
$master_dbh->do("DROP TABLE IF EXISTS test.t1");
$master_dbh->do("DROP TABLE IF EXISTS test.t2");
$master_dbh->do("DROP DATABASE IF EXISTS test");
$master_dbh->do("DROP TABLESPACE foo");

1
t/pt-mysql-summary/samples/expected_output_temp002.txt
View File

@@ -277,3 +277,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp003.txt
View File

@@ -220,3 +220,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp004.txt
View File

@@ -219,3 +219,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp005.txt
View File

@@ -292,3 +292,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp006.txt
View File

@@ -341,3 +341,4 @@ log_queries_not_using_indexes | OFF
# Configuration File #########################################
Config File | Cannot autodetect or find, giving up
# Memory management library ##################################
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp007.txt
View File

@@ -295,3 +295,4 @@ log_queries_not_using_indexes | OFF
# Configuration File #########################################
Config File | Cannot autodetect or find, giving up
# Memory management library ##################################
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp_enc002.txt
View File

@@ -282,5 +282,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp_enc003.txt
View File

@@ -225,5 +225,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp_enc004.txt
View File

@@ -224,5 +224,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp_enc005.txt
View File

@@ -297,5 +297,4 @@ report-port = 12345
log-error = mysqld.log
innodb_lock_wait_timeout = 3
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp_enc006.txt
View File

@@ -346,5 +346,4 @@ log_queries_not_using_indexes | OFF
# Configuration File #########################################
Config File | Cannot autodetect or find, giving up
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

1
t/pt-mysql-summary/samples/expected_output_temp_enc007.txt
View File

@@ -300,5 +300,4 @@ log_queries_not_using_indexes | OFF
# Configuration File #########################################
Config File | Cannot autodetect or find, giving up
# Memory management library ##################################
Jemalloc library not found
# The End ####################################################

4
t/pt-table-checksum/pt-136.t
View File

@@ -28,6 +28,8 @@ else {
}
$sb->load_file('master', 't/pt-table-checksum/samples/pt-136.sql');
$sb->wait_for_slaves();
sleep(1);
# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the tool will die.
# And --max-load "" prevents waiting for status variables.
@@ -44,7 +46,7 @@ $output = output(
is(
$exit_status,
0,
"Checksum columns with mismatching collaitons",
"Checksum columns with mismatching collations",
);
# #############################################################################