diff options
Diffstat (limited to 'mysql-test/suite/compat/oracle/r')
5 files changed, 37 insertions, 37 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-cursor.result b/mysql-test/suite/compat/oracle/r/sp-cursor.result index 2e0c43c8b87..d7e88430bc7 100644 --- a/mysql-test/suite/compat/oracle/r/sp-cursor.result +++ b/mysql-test/suite/compat/oracle/r/sp-cursor.result @@ -454,12 +454,12 @@ CALL p1('1b'); msg Fetched a record a=1 Warnings: -Warning 1265 Data truncated for column 'p_a' at row 1 +Warning 1265 Data truncated for column 'p_a' at row 0 CALL p1('b1'); msg Fetched a record a=0 Warnings: -Warning 1366 Incorrect integer value: 'b1' for column ``.``.`p_a` at row 1 +Warning 1366 Incorrect integer value: 'b1' for column ``.``.`p_a` at row 0 DROP PROCEDURE p1; # # One parameter in SELECT list + subselect diff --git a/mysql-test/suite/compat/oracle/r/sp-param.result b/mysql-test/suite/compat/oracle/r/sp-param.result index 3b9be4585d4..bb415bd74a7 100644 --- a/mysql-test/suite/compat/oracle/r/sp-param.result +++ b/mysql-test/suite/compat/oracle/r/sp-param.result @@ -152,7 +152,7 @@ begin call p1(w,'0123456789'); end; / -ERROR 22001: Data too long for column 'pinout' at row 1 +ERROR 22001: Data too long for column 'pinout' at row 0 declare w varchar(20); begin w:='aaa'; @@ -165,7 +165,7 @@ w:='aaa'; call p1(w,'0123456789'); end; / -ERROR 22001: Data too long for column 'pinout' at row 1 +ERROR 22001: Data too long for column 'pinout' at row 0 declare str varchar(6000); pout varchar(6000); begin @@ -184,7 +184,7 @@ call p1(pout,str); select length(pout); end; / -ERROR 22001: Data too long for column 'pinout' at row 1 +ERROR 22001: Data too long for column 'pinout' at row 0 declare str varchar(40000); pout varchar(60000); begin @@ -203,7 +203,7 @@ call p1(pout,str); select length(pout); end; / -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 declare str text(80000); pout text(80000); begin @@ -240,7 +240,7 @@ CALL p2(11); LENGTH(pinout) 10 Warnings: -Warning 1265 Data truncated for column 'pinout' at row 1 +Warning 1265 Data truncated for column 'pinout' at row 0 DROP PROCEDURE p1; DROP PROCEDURE p2; SET sql_mode=ORACLE; @@ -261,12 +261,12 @@ CALL p2(65535); LENGTH(f1(str,padlen)) 65532 Warnings: -Warning 1265 Data truncated for column 'pin' at row 1 +Warning 1265 Data truncated for column 'pin' at row 0 CALL p2(65536); LENGTH(f1(str,padlen)) 65532 Warnings: -Warning 1265 Data truncated for column 'pin' at row 1 +Warning 1265 Data truncated for column 'pin' at row 0 DROP PROCEDURE p2; DROP FUNCTION f1; SET sql_mode='ORACLE,STRICT_TRANS_TABLES'; @@ -290,9 +290,9 @@ CALL p2(21844); length(pout) 21844 CALL p2(21845); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(21846); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 DROP PROCEDURE p2; DROP PROCEDURE p1; SET sql_mode='ORACLE,STRICT_TRANS_TABLES'; @@ -316,9 +316,9 @@ CALL p2(21844); length(pout) 21844 CALL p2(21845); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(21846); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 DROP PROCEDURE p2; DROP PROCEDURE p1; SET sql_mode='ORACLE,STRICT_TRANS_TABLES'; @@ -339,13 +339,13 @@ CALL p2(65532); LENGTH(f1(str,padlen)) 65532 CALL p2(65533); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(65534); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(65535); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(65536); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 DROP PROCEDURE p2; DROP FUNCTION f1; SET sql_mode='ORACLE,STRICT_TRANS_TABLES'; @@ -366,9 +366,9 @@ CALL p2(21844); LENGTH(f1(str,padlen)) 21844 CALL p2(21845); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(21846); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 DROP PROCEDURE p2; DROP FUNCTION f1; SET sql_mode='ORACLE,STRICT_TRANS_TABLES'; @@ -389,9 +389,9 @@ CALL p2(21844); LENGTH(f1(str,padlen)) 21844 CALL p2(21845); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(21846); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 DROP PROCEDURE p2; DROP FUNCTION f1; SET sql_mode='ORACLE,STRICT_TRANS_TABLES'; @@ -412,12 +412,12 @@ CALL p2(65532); LENGTH(f1(str,padlen)) 65532 CALL p2(65533); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(65534); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(65535); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 CALL p2(65536); -ERROR 22001: Data too long for column 'pin' at row 1 +ERROR 22001: Data too long for column 'pin' at row 0 DROP PROCEDURE p2; DROP FUNCTION f1; diff --git a/mysql-test/suite/compat/oracle/r/sp-row.result b/mysql-test/suite/compat/oracle/r/sp-row.result index 3ed11d7f9de..0b23f303030 100644 --- a/mysql-test/suite/compat/oracle/r/sp-row.result +++ b/mysql-test/suite/compat/oracle/r/sp-row.result @@ -24,7 +24,7 @@ RETURN a; END; $$ SELECT f1(ROW(10,20)); -ERROR 21000: Operand should contain 1 column(s) +ERROR HY000: Cannot cast 'row' as 'int' in assignment of `f1(ROW(10,20))` DROP FUNCTION f1; # # ROW as an SP parameter @@ -261,7 +261,7 @@ SELECT f1(a); END; $$ CALL p1(); -ERROR 21000: Operand should contain 1 column(s) +ERROR HY000: Cannot cast 'row' as 'int' in assignment of `a` DROP PROCEDURE p1; DROP FUNCTION f1; CREATE FUNCTION f1(a INT) RETURN INT @@ -278,7 +278,7 @@ SELECT f1(a); END; $$ CALL p1(); -ERROR 21000: Operand should contain 1 column(s) +ERROR HY000: Cannot cast 'row' as 'int' in assignment of `a` DROP PROCEDURE p1; DROP FUNCTION f1; # @@ -332,7 +332,7 @@ RETURN rec; END; $$ SELECT f1(10); -ERROR 21000: Operand should contain 1 column(s) +ERROR HY000: Cannot cast 'row' as 'int' in assignment of `f1(10)` DROP FUNCTION f1; # # Using the entire ROW in SELECT..CREATE diff --git a/mysql-test/suite/compat/oracle/r/sp.result b/mysql-test/suite/compat/oracle/r/sp.result index 2e7b21b2d75..2e212530ae5 100644 --- a/mysql-test/suite/compat/oracle/r/sp.result +++ b/mysql-test/suite/compat/oracle/r/sp.result @@ -1286,7 +1286,7 @@ CALL p1(); a b 127 200 Warnings: -Warning 1264 Out of range value for column 'a' at row 1 +Warning 1264 Out of range value for column 'a' at row 0 DROP PROCEDURE p1; DROP TABLE t1; # @@ -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, |