summaryrefslogtreecommitdiff
path: root/mysql-test/main/mysqlbinlog_stmt_compressed.result
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2023-03-29 16:53:37 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2023-03-29 16:53:37 +0300
commitd84a2826290d9676faebba0849d1b9fb7f5efcd8 (patch)
tree22a7c58cda643c4c0f1c610e4d77c29d0995c5c0 /mysql-test/main/mysqlbinlog_stmt_compressed.result
parent50c8ef01fc63e32acd38788107ae4029d0f1b9ce (diff)
parent191821f7df312a8d0f723cc937ef6a6e2388b0d6 (diff)
downloadmariadb-git-d84a2826290d9676faebba0849d1b9fb7f5efcd8.tar.gz
Merge 10.10 into 10.11
Diffstat (limited to 'mysql-test/main/mysqlbinlog_stmt_compressed.result')
-rw-r--r--mysql-test/main/mysqlbinlog_stmt_compressed.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/mysqlbinlog_stmt_compressed.result b/mysql-test/main/mysqlbinlog_stmt_compressed.result
index b2790e5a079..c0d26f3f9df 100644
--- a/mysql-test/main/mysqlbinlog_stmt_compressed.result
+++ b/mysql-test/main/mysqlbinlog_stmt_compressed.result
@@ -37,7 +37,7 @@ SET @@session.foreign_key_checks=1, @@session.sql_auto_is_null=0, @@session.uniq
SET @@session.sql_mode=#/*!*/;
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=#/*!*/;
+SET @@session.character_set_client=latin1,@@session.collation_connection=8,@@session.collation_server=#/*!*/;
SET @@session.lc_time_names=0/*!*/;
SET @@session.collation_database=DEFAULT/*!*/;
CREATE TABLE t1 (pk INT PRIMARY KEY, f1 INT, f2 INT, f3 TINYINT, f4 MEDIUMINT, f5 BIGINT, f6 INT, f7 INT, f8 char(1))