diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:20:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-03-29 17:20:42 +0300 |
| commit | 5e01255732f554bbf473347566439fd18c006756 (patch) | |
| tree | f174de61c99f8b6428395b0275e885ee500365b6 /mysql-test/suite/galera | |
| parent | 6c3b1dced41c238f814aeabbc725e31c3106c0f4 (diff) | |
| parent | d84a2826290d9676faebba0849d1b9fb7f5efcd8 (diff) | |
| download | mariadb-git-5e01255732f554bbf473347566439fd18c006756.tar.gz | |
Merge 10.11 into 11.0
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 8f85a838c5d..6060e8d1b72 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) |