diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-28 10:33:26 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-28 10:33:26 +0300 |
| commit | f79cebb4d02a7b5151ac617bc762c3e094436562 (patch) | |
| tree | 16008fa4f8d8d0b9b884670f6d850ae6a151520a /mysql-test/suite/compat | |
| parent | 1630037959ab9516fc2a56d4901d2e5d794bc8e7 (diff) | |
| parent | 742e1c727fc2be50b758068c2ab92abb19f3ff56 (diff) | |
| download | mariadb-git-f79cebb4d02a7b5151ac617bc762c3e094436562.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'mysql-test/suite/compat')
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/sp-anchor-row-type-table.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/compat/oracle/r/sp.result | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/suite/compat/oracle/r/sp-anchor-row-type-table.result b/mysql-test/suite/compat/oracle/r/sp-anchor-row-type-table.result index 9edec669908..b878042174b 100644 --- a/mysql-test/suite/compat/oracle/r/sp-anchor-row-type-table.result +++ b/mysql-test/suite/compat/oracle/r/sp-anchor-row-type-table.result @@ -21,7 +21,7 @@ Table Create Table t2 CREATE TABLE "t2" ( "a" int(11) DEFAULT NULL, "b" text DEFAULT NULL, - "c" char(1) DEFAULT NULL + "c" varchar(1) DEFAULT NULL ) DROP PROCEDURE p2; DROP PROCEDURE p1; diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result index 44092c0be30..047fada5acb 100644 --- a/mysql-test/suite/compat/oracle/r/sp.result +++ b/mysql-test/suite/compat/oracle/r/sp.result @@ -1703,8 +1703,8 @@ t2 CREATE TABLE "t2" ( "t2" text DEFAULT NULL, "t3" mediumtext DEFAULT NULL, "t4" longtext DEFAULT NULL, - "enum1" char(1) DEFAULT NULL, - "set1" char(5) DEFAULT NULL, + "enum1" varchar(1) DEFAULT NULL, + "set1" varchar(5) DEFAULT NULL, "blob1" tinyblob DEFAULT NULL, "blob2" longblob DEFAULT NULL, "blob3" mediumblob DEFAULT NULL, @@ -1865,8 +1865,8 @@ t2 CREATE TABLE "t2" ( "t2" text DEFAULT NULL, "t3" mediumtext DEFAULT NULL, "t4" longtext DEFAULT NULL, - "enum1" char(1) DEFAULT NULL, - "set1" char(5) DEFAULT NULL, + "enum1" varchar(1) DEFAULT NULL, + "set1" varchar(5) DEFAULT NULL, "blob1" tinyblob DEFAULT NULL, "blob2" longblob DEFAULT NULL, "blob3" mediumblob DEFAULT NULL, @@ -2370,7 +2370,7 @@ t1 CREATE TABLE "t1" ( "a_flt0" float DEFAULT NULL, "a_dbl0" double DEFAULT NULL, "a_bit3" bit(3) DEFAULT NULL, - "a_enum0" char(1) DEFAULT NULL, + "a_enum0" varchar(1) DEFAULT NULL, "a_varchar10" varchar(10) DEFAULT NULL, "a_text1" text DEFAULT NULL, "a_tinytext1" tinytext DEFAULT NULL, @@ -2388,7 +2388,7 @@ t1 CREATE TABLE "t1" ( "aa_flt0" float DEFAULT NULL, "aa_dbl0" double DEFAULT NULL, "aa_bit3" bit(3) DEFAULT NULL, - "aa_enum0" char(1) DEFAULT NULL, + "aa_enum0" varchar(1) DEFAULT NULL, "aa_varchar10" varchar(10) DEFAULT NULL, "aa_text1" text DEFAULT NULL, "aa_tinytext1" tinytext DEFAULT NULL, |