diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-07-01 18:15:00 +0000 |
| commit | a2a2e32c02643a0cec111511220227703fda1cd5 (patch) | |
| tree | 69cc2b631234c2a8e026b9cd4d72676c61c594df /mysql-test/suite/perfschema/include | |
| parent | Releasing progress-linux version 1:10.11.8-1~progress7.99u1. (diff) | |
| download | mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.tar.xz mariadb-a2a2e32c02643a0cec111511220227703fda1cd5.zip | |
Merging upstream version 1:11.4.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mysql-test/suite/perfschema/include')
| -rw-r--r-- | mysql-test/suite/perfschema/include/hostcache_set_state.inc | 2 | ||||
| -rw-r--r-- | mysql-test/suite/perfschema/include/upgrade_check.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/perfschema/include/hostcache_set_state.inc b/mysql-test/suite/perfschema/include/hostcache_set_state.inc index 29f32123..995a1028 100644 --- a/mysql-test/suite/perfschema/include/hostcache_set_state.inc +++ b/mysql-test/suite/perfschema/include/hostcache_set_state.inc @@ -9,7 +9,7 @@ flush privileges; # Print critical setup -#select @@global.debug; +#select @@global.debug_dbug; #select @@global.max_connect_errors; #select @@global.max_user_connections; #select @@global.max_connections; diff --git a/mysql-test/suite/perfschema/include/upgrade_check.inc b/mysql-test/suite/perfschema/include/upgrade_check.inc index c16e90c7..30e33ebb 100644 --- a/mysql-test/suite/perfschema/include/upgrade_check.inc +++ b/mysql-test/suite/perfschema/include/upgrade_check.inc @@ -12,4 +12,4 @@ --cat_file $MYSQLTEST_VARDIR/tmp/err_file --remove_file $MYSQLTEST_VARDIR/tmp/out_file --remove_file $MYSQLTEST_VARDIR/tmp/err_file ---remove_file $MYSQLD_DATADIR/mysql_upgrade_info +--remove_file $MYSQLD_DATADIR/mariadb_upgrade_info |