Adding upstream version 1:10.5.12.upstream/1%10.5.12upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 36 insertions, 0 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_table_options.result b/mysql-test/suite/rpl/r/rpl_table_options.result
new file mode 100644
index 00000000..7afec3fa
--- /dev/null
+++ b/mysql-test/suite/rpl/r/rpl_table_options.result
@@ -0,0 +1,36 @@
+include/master-slave.inc
+[connection master]
+install plugin example soname 'ha_example.so';
+set default_storage_engine=example;
+connection slave;
+connection master;
+create table t1 (a int not null) ull=12340;
+alter table t1 ull=12350;
+Warnings:
+Note	1105	EXAMPLE DEBUG: ULL 12340 -> 12350
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL
+) ENGINE=EXAMPLE DEFAULT CHARSET=latin1 `ull`=12350
+connection slave;
+connection slave;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 /* `ull`=12350 */
+set sql_mode=ignore_bad_table_options;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1 `ull`=12350
+connection master;
+drop table t1;
+set default_storage_engine=default;
+select 1;
+1
+1
+uninstall plugin example;
+include/rpl_end.inc