diff options
| author | Daniel Black <daniel@mariadb.org> | 2020-11-03 19:49:46 +1100 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2020-11-03 19:50:12 +1100 |
| commit | 54cd9b93acfe0643ef6a7a63b316722625c16e03 (patch) | |
| tree | 3c9d40f7a97beac43b8d6e0ceb9d2f2597a436cf | |
| parent | 338b3dd1349ad26d8716c19177ff9533f25f4ec0 (diff) | |
| download | mariadb-git-bb-10.5-merge-danielblack-MDEV-23630-mysqldump-testfix.tar.gz | |
MDEV-23630: mysqldump-system test fix for 10.5 mergebb-10.5-merge-danielblack-MDEV-23630-mysqldump-testfix
version_id in output replaced with replace_regex
| -rw-r--r-- | mysql-test/main/mysqldump-system.result | 18 | ||||
| -rw-r--r-- | mysql-test/main/mysqldump-system.test | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/mysql-test/main/mysqldump-system.result b/mysql-test/main/mysqldump-system.result index d887df81d2b..356396a5169 100644 --- a/mysql-test/main/mysqldump-system.result +++ b/mysql-test/main/mysqldump-system.result @@ -430,10 +430,10 @@ UNLOCK TABLES; SELECT * FROM mysql.global_priv ORDER BY User,Host; Host User Priv -% USER {"access":0,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"default_role":"role_2"} -localhost mariadb.sys {"access":0,"plugin":"mysql_native_password","authentication_string":"","account_locked":false,"password_last_changed":NOW} - role_1 {"access":16384,"is_role":true} - role_2 {"access":0,"is_role":true} +% USER {"access":0,"version_id":VERSION,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"default_role":"role_2"} +localhost mariadb.sys {"access":0,"plugin":"mysql_native_password","authentication_string":"","account_locked":false,"password_last_changed":NOW,"version_id":VERSION} + role_1 {"access":16384,"version_id":VERSION,"is_role":true} + role_2 {"access":0,"version_id":VERSION,"is_role":true} localhost root {"access":18446744073709551615} CHECKSUM TABLE mysql.roles_mapping, mysql.time_zone_transition, mysql.plugin, mysql.servers, mysql.func, mysql.innodb_table_stats, mysql.table_stats; @@ -465,11 +465,11 @@ set time_zone= @@global.time_zone; DROP USER mariadb_test_restore; SELECT * FROM mysql.global_priv ORDER BY User,Host; Host User Priv -% USER {"access":0,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"default_role":"role_2"} -localhost mariadb.sys {"access":0,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"password_lifetime":-1,"default_role":""} - role_1 {"access":16384,"is_role":true} - role_2 {"access":0,"is_role":true} -localhost root {"access":1073741823,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"default_role":""} +% USER {"access":0,"version_id":VERSION,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"default_role":"role_2"} +localhost mariadb.sys {"access":0,"version_id":VERSION,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"password_lifetime":-1,"default_role":""} + role_1 {"access":16384,"version_id":VERSION,"is_role":true} + role_2 {"access":0,"version_id":VERSION,"is_role":true} +localhost root {"access":274877906943,"version_id":VERSION,"plugin":"mysql_native_password","authentication_string":"","password_last_changed":NOW,"default_role":""} CHECKSUM TABLE mysql.roles_mapping, mysql.time_zone_transition, mysql.plugin, mysql.servers, mysql.func, mysql.innodb_table_stats, mysql.table_stats; Table Checksum diff --git a/mysql-test/main/mysqldump-system.test b/mysql-test/main/mysqldump-system.test index 3232b012acf..9aaa5fff6f9 100644 --- a/mysql-test/main/mysqldump-system.test +++ b/mysql-test/main/mysqldump-system.test @@ -90,7 +90,7 @@ eval CREATE FUNCTION metaphon RETURNS STRING SONAME "$UDF_EXAMPLE_SO"; # password_last_changed date isn't saved/restored # root user's Priv $.access lower number on restore ---replace_regex /"password_last_changed":[0-9]+/"password_last_changed":NOW/ +--replace_regex /"password_last_changed":[0-9]+/"password_last_changed":NOW/ /"version_id":[0-9]+/"version_id":VERSION/ SELECT * FROM mysql.global_priv ORDER BY User,Host; CHECKSUM TABLE mysql.roles_mapping, mysql.time_zone_transition, mysql.plugin, @@ -122,7 +122,7 @@ DROP USER mariadb_test_restore; # successful restore? ---replace_regex /"password_last_changed":[0-9]+/"password_last_changed":NOW/ +--replace_regex /"password_last_changed":[0-9]+/"password_last_changed":NOW/ /"version_id":[0-9]+/"version_id":VERSION/ SELECT * FROM mysql.global_priv ORDER BY User,Host; CHECKSUM TABLE mysql.roles_mapping, mysql.time_zone_transition, mysql.plugin, |