diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 15:29:02 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 15:29:02 +0300 |
| commit | 191821f7df312a8d0f723cc937ef6a6e2388b0d6 (patch) | |
| tree | 1d7713309f9f9673c98c7d4b139b8d8a2c300c4c /mysql-test/suite/rpl/r/rpl_old_master_29078.result | |
| parent | 78d0d74eb72ac4e8f763511d9d20dda020dd8673 (diff) | |
| parent | 55e78ebf4136ed7bf78b45963f53e503201a59bb (diff) | |
| download | mariadb-git-191821f7df312a8d0f723cc937ef6a6e2388b0d6.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_old_master_29078.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_old_master_29078.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_old_master_29078.result b/mysql-test/suite/rpl/r/rpl_old_master_29078.result index 093e2ae0c24..cb096e67a52 100644 --- a/mysql-test/suite/rpl/r/rpl_old_master_29078.result +++ b/mysql-test/suite/rpl/r/rpl_old_master_29078.result @@ -20,7 +20,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq SET @@session.sql_mode=1411383296/*!*/; SET @@session.auto_increment_increment=1, @@session.auto_increment_offset=1/*!*/; /*!\C utf8mb3 *//*!*/; -SET @@session.character_set_client=33,@@session.collation_connection=33,@@session.collation_server=8/*!*/; +SET @@session.character_set_client=utf8mb3,@@session.collation_connection=33,@@session.collation_server=8/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; create table t1 (f1 timestamp, f2 timestamp) |