diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:07:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-21 10:07:09 +0300 |
| commit | a8e45404765db6bc6c57dab3cc834e92a44d0110 (patch) | |
| tree | 901416c2f3931ea4b9df5a1d95e6c358a7954a25 /mysql-test/suite/rpl/r/create_or_replace_row.result | |
| parent | 4a7367d5282978207ad91e0b595b75a35dc37fec (diff) | |
| parent | 4345d9310080e6e4cbf1040263a2653f7d3d9227 (diff) | |
| download | mariadb-git-a8e45404765db6bc6c57dab3cc834e92a44d0110.tar.gz | |
Merge 10.8 into 10.9
Diffstat (limited to 'mysql-test/suite/rpl/r/create_or_replace_row.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/create_or_replace_row.result | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/create_or_replace_row.result b/mysql-test/suite/rpl/r/create_or_replace_row.result index 16f92b5e4b6..3bb99839751 100644 --- a/mysql-test/suite/rpl/r/create_or_replace_row.result +++ b/mysql-test/suite/rpl/r/create_or_replace_row.result @@ -149,7 +149,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `new_table` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci connection server_1; drop table t1; # @@ -226,7 +226,7 @@ show create table t1; Table Create Table t1 CREATE TABLE `t1` ( `server_2_ver_2` int(11) DEFAULT NULL -) ENGINE=MyISAM DEFAULT CHARSET=latin1 +) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci binlog from server 2 include/show_binlog_events.inc Log_name Pos Event_type Server_id End_log_pos Info |