diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-22 15:54:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-22 15:54:45 +0200 |
| commit | 1efdf67e6015e557980de321f8ec09fe3f000bd3 (patch) | |
| tree | b5ca438d64efd545babfd804698ad5beeaa3ba26 /mysql-test/suite/galera | |
| parent | 535a38c4559160c7a46f0d9ece52495b83718d45 (diff) | |
| parent | 701399ad375fe71daded4fc7f18f347594352aa1 (diff) | |
| download | mariadb-git-1efdf67e6015e557980de321f8ec09fe3f000bd3.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/galera')
| -rw-r--r-- | mysql-test/suite/galera/r/galera_gra_log.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/r/galera_gra_log.result b/mysql-test/suite/galera/r/galera_gra_log.result index 8ac76692262..8c0286a4ef1 100644 --- a/mysql-test/suite/galera/r/galera_gra_log.result +++ b/mysql-test/suite/galera/r/galera_gra_log.result @@ -22,7 +22,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 latin1 *//*!*/; -SET @@session.character_set_client=8,@@session.collation_connection=8,@@session.collation_server=8/*!*/; +SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=8/*!*/; SET @@session.lc_time_names=0/*!*/; SET @@session.collation_database=DEFAULT/*!*/; CREATE TABLE t1 (f1 INTEGER) |