MDEV-12695 Add Column_definition::type_handler()

MariaDB · May 5, 2017 · aacb4d5 · aacb4d5
1 parent 1ff7956
commit aacb4d5
Show file tree

Hide file tree

Showing 20 changed files with 202 additions and 213 deletions.
diff --git a/mysql-test/r/signal_code.result b/mysql-test/r/signal_code.result
@@ -31,5 +31,5 @@ Pos	Instruction
 1	stmt 130 "SIGNAL foo SET MESSAGE_TEXT = "This i..."
 2	stmt 131 "RESIGNAL foo"
 3	stmt 131 "RESIGNAL foo SET MESSAGE_TEXT = "This..."
-4	freturn 3 0
+4	freturn int 0
 drop function signal_func;
diff --git a/mysql-test/r/sp-code.result b/mysql-test/r/sp-code.result
@@ -11,7 +11,7 @@ returns int
 return 0;
 show function code almost_empty;
 Pos	Instruction
-0	freturn 3 0
+0	freturn int 0
 drop function almost_empty;
 create procedure code_sample(x int, out err int, out nulls int)
 begin
@@ -957,10 +957,10 @@ END
 $
 SHOW FUNCTION CODE testf_bug11763507;
 Pos	Instruction
-0	freturn 3 0
+0	freturn int 0
 SHOW FUNCTION CODE TESTF_bug11763507;
 Pos	Instruction
-0	freturn 3 0
+0	freturn int 0
 SHOW PROCEDURE CODE testp_bug11763507;
 Pos	Instruction
 0	stmt 0 "SELECT "PROCEDURE testp_bug11763507""

diff --git a/mysql-test/suite/compat/oracle/r/sp-code.result b/mysql-test/suite/compat/oracle/r/sp-code.result
@@ -11,7 +11,7 @@ END;
 /
 SHOW FUNCTION CODE f1;
 Pos	Instruction
-0	freturn 3 10
+0	freturn int 10
 SELECT f1();
 f1()
 10
@@ -418,7 +418,7 @@ Pos	Instruction
 1	set i@0 i@0 + 1
 2	jump_if_not 1(1) i@0 >= 5
 3	jump 4
-4	freturn 3 i@0
+4	freturn int i@0
 SELECT f1() FROM DUAL;
 f1()
 5
@@ -440,7 +440,7 @@ Pos	Instruction
 1	set i@0 i@0 + 1
 2	jump_if_not 1(0) i@0 >= 5
 3	jump 4
-4	freturn 3 i@0
+4	freturn int i@0
 SELECT f1() FROM DUAL;
 f1()
 5
@@ -474,7 +474,7 @@ Pos	Instruction
 7	hreturn 0 8
 8	hpop 1
 9	jump 5
-10	freturn 3 i@0
+10	freturn int i@0
 SELECT f1() FROM DUAL;
 f1()
 5
@@ -586,7 +586,7 @@ Pos	Instruction
 6	jump 9
 7	set i@3 i@3 + 1
 8	jump 3
-9	freturn 3 total@2
+9	freturn int total@2
 SELECT f1(3, 100) FROM DUAL;
 f1(3, 100)
 6
@@ -619,7 +619,7 @@ Pos	Instruction
 6	jump 9
 7	set i@3 i@3 + -1
 8	jump 3
-9	freturn 3 total@2
+9	freturn int total@2
 SELECT f1(3, 100) FROM DUAL;
 f1(3, 100)
 6
@@ -666,7 +666,7 @@ Pos	Instruction
 14	jump 7
 15	set ia@5 ia@5 + 1
 16	jump 3
-17	freturn 3 total@4
+17	freturn int total@4
 SELECT f1(2, 1, 2, 2) FROM DUAL;
 f1(2, 1, 2, 2)
 1001
@@ -707,7 +707,7 @@ Pos	Instruction
 8	set total@1 total@1 + 1
 9	set i@2 i@2 + 1
 10	jump 3
-11	freturn 3 total@1
+11	freturn int total@1
 SELECT f1(3), f1(4), f1(5), f1(6) FROM DUAL;
 f1(3)	f1(4)	f1(5)	f1(6)
 3003	4004	5004	6005
@@ -749,7 +749,7 @@ Pos	Instruction
 13	jump 6
 14	set i@2 i@2 + 1
 15	jump 3
-16	freturn 3 total@1
+16	freturn int total@1
 SELECT f1(3), f1(4), f1(5), f1(6) FROM DUAL;
 f1(3)	f1(4)	f1(5)	f1(6)
 6006	8008	9008	11010
@@ -792,7 +792,7 @@ Pos	Instruction
 13	jump 6
 14	set j@2 j@2 + 1
 15	jump 3
-16	freturn 3 total@1
+16	freturn int total@1
 SELECT f1(3), f1(4), f1(5), f1(6) FROM DUAL;
 f1(3)	f1(4)	f1(5)	f1(6)
 6006	8008	10008	12010
@@ -822,7 +822,7 @@ Pos	Instruction
 7	set total@1 total@1 + 1
 8	set i@2 i@2 + 1
 9	jump 3
-10	freturn 3 total@1
+10	freturn int total@1
 SELECT f1(3), f1(4), f1(5), f1(6) FROM DUAL;
 f1(3)	f1(4)	f1(5)	f1(6)
 3	4	4	5
@@ -902,7 +902,7 @@ SHOW FUNCTION CODE f1;
 Pos	Instruction
 0	set a@0 NULL
 1	set a.b@0[1] 200
-2	freturn 3 a.b@0[1]
+2	freturn int a.b@0[1]
 SELECT f1();
 f1()
 200