diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-31 10:28:59 +0300 |
| commit | 4a0b56f60436cab3f2f60b15ec699cb19c1e10ba (patch) | |
| tree | 141f7f177748f763dab14484514453cec367c585 /mysql-test/main/alter_table.result | |
| parent | 0bf843cd13981b03920bfc49c646b28a130f5d47 (diff) | |
| parent | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (diff) | |
| download | mariadb-git-4a0b56f60436cab3f2f60b15ec699cb19c1e10ba.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/main/alter_table.result')
| -rw-r--r-- | mysql-test/main/alter_table.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/main/alter_table.result b/mysql-test/main/alter_table.result index 5999f2c43c3..6572e5c9238 100644 --- a/mysql-test/main/alter_table.result +++ b/mysql-test/main/alter_table.result @@ -2598,6 +2598,11 @@ alter table person_principal add column if not exists date_mask tinyint null; update person_principal set date_mask = 0; alter table person_principal modify column date_mask tinyint not null; drop tables person_principal_hist, person_principal; +CREATE OR REPLACE TABLE `t1` ( `id` varchar(64) NOT NULL, `name` varchar(255) NOT NULL, `extra` text DEFAULT NULL, `password` varchar(128) DEFAULT NULL, `enabled` tinyint(1) DEFAULT NULL, `domain_id` varchar(64) NOT NULL, `default_project_id` varchar(64) DEFAULT NULL, PRIMARY KEY (`id`), CONSTRAINT `CONSTRAINT_1` CHECK (`enabled` in (0,1)) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +insert into t1 (id,name,enabled,domain_id) values (1,"Monty",1,"domain_id"); +insert into t1 (id,name,enabled,domain_id) values (2,"Monty2",1,"domain_id2"); +ALTER TABLE t1 ADD CONSTRAINT ixu_user2_name_domain_id UNIQUE (domain_id, name); +DROP TABLE t1; # # End of 10.4 tests # @@ -3306,3 +3311,6 @@ t2 CREATE TABLE `t2` ( `b` int(11) DEFAULT NULL ) ENGINE=MyISAM DEFAULT CHARSET=latin1 drop table t2; +# +# End of 10.5 tests +# |