summaryrefslogtreecommitdiff
path: root/mysql-test/suite/engines/funcs/r/rpl_alter,innodb.rdiff
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/engines/funcs/r/rpl_alter,innodb.rdiff')
-rw-r--r--mysql-test/suite/engines/funcs/r/rpl_alter,innodb.rdiff32
1 files changed, 16 insertions, 16 deletions
diff --git a/mysql-test/suite/engines/funcs/r/rpl_alter,innodb.rdiff b/mysql-test/suite/engines/funcs/r/rpl_alter,innodb.rdiff
index 0c70e2c0cfc..d1d51ba096b 100644
--- a/mysql-test/suite/engines/funcs/r/rpl_alter,innodb.rdiff
+++ b/mysql-test/suite/engines/funcs/r/rpl_alter,innodb.rdiff
@@ -2,8 +2,8 @@
`a` int(10) unsigned NOT NULL,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
insert into t1 (a) values (1),((1<<32)-1);
select * from t1;
a b
@@ -11,8 +11,8 @@
`a` bigint(20) NOT NULL,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a b
1 NULL
@@ -20,8 +20,8 @@
`a` int(10) unsigned NOT NULL,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a b
1 NULL
@@ -29,8 +29,8 @@
`a` bigint(20) unsigned NOT NULL,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
select * from t1;
a b
1 NULL
@@ -38,8 +38,8 @@
`a` bigint(20) unsigned NOT NULL,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
connection master;
create table t2 (a int unsigned auto_increment primary key, b int);
show create table t2;
@@ -47,8 +47,8 @@
`a` int(10) unsigned NOT NULL AUTO_INCREMENT,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
alter table t2 modify a bigint;
show create table t2;
Table Create Table
@@ -56,8 +56,8 @@
`a` bigint(20) NOT NULL,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
alter table t2 modify a bigint auto_increment;
show create table t2;
Table Create Table
@@ -65,8 +65,8 @@
`a` bigint(20) NOT NULL AUTO_INCREMENT,
`b` int(11) DEFAULT NULL,
PRIMARY KEY (`a`)
--) ENGINE=MyISAM DEFAULT CHARSET=latin1
-+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
++) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci
drop table t1,t2;
#
# MDEV-8432: Slave cannot replicate signed integer-type values