Skip to content

Commit e63311c

Browse files
abarkovabarkov
committed
MDEV-33496 Out of range error in AVG(YEAR(datetime)) due to a wrong data type
Functions extracting non-negative datetime components: - YEAR(dt), EXTRACT(YEAR FROM dt) - QUARTER(td), EXTRACT(QUARTER FROM dt) - MONTH(dt), EXTRACT(MONTH FROM dt) - WEEK(dt), EXTRACT(WEEK FROM dt) - HOUR(dt), - MINUTE(dt), - SECOND(dt), - MICROSECOND(dt), - DAYOFYEAR(dt) - EXTRACT(YEAR_MONTH FROM dt) did not set their max_length properly, so in the DECIMAL context they created a too small DECIMAL column, which led to the 'Out of range value' error. The problem is that most of these functions historically returned the signed INT data type. There were two simple ways to fix these functions: 1. Add +1 to max_length. But this would also change their size in the string context and create too long VARCHAR columns, with +1 excessive size. 2. Preserve max_length, but change the data type from INT to INT UNSIGNED. But this would break backward compatibility. Also, using UNSIGNED is generally not desirable, it's better to stay with signed when possible. This fix implements another solution, which it makes all these functions work well in all contexts: int, decimal, string. Fix details: - Adding a new special class Type_handler_long_ge0 - the data type handler for expressions which: * should look like normal signed INT * but which known not to return negative values Expressions handled by Type_handler_long_ge0 store in Item::max_length only the number of digits, without adding +1 for the sign. - Fixing Item_extract to use Type_handler_long_ge0 for non-negative datetime components: YEAR, YEAR_MONTH, QUARTER, MONTH, WEEK - Adding a new abstract class Item_long_ge0_func, for functions returning non-negative datetime components. Item_long_ge0_func uses Type_handler_long_ge0 as the type handler. The class hierarchy now looks as follows: Item_long_ge0_func Item_long_func_date_field Item_func_to_days Item_func_dayofmonth Item_func_dayofyear Item_func_quarter Item_func_year Item_long_func_time_field Item_func_hour Item_func_minute Item_func_second Item_func_microsecond - Cleanup: EXTRACT(QUARTER FROM dt) created an excessive VARCHAR column in string context. Changing its length from 2 to 1.
1 parent d57c44f commit e63311c

16 files changed

+1373
-38
lines changed

‎mysql-test/main/func_extract.result‎

Lines changed: 882 additions & 0 deletions
Large diffs are not rendered by default.

‎mysql-test/main/func_extract.test‎

Lines changed: 251 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,3 +263,254 @@ SELECT
263263
FROM t1;
264264
DROP TABLE t1;
265265
--enable_view_protocol
266+
267+
268+
--echo #
269+
--echo # Start of 10.5 tests
270+
--echo #
271+
272+
--echo #
273+
--echo # MDEV-33496 Out of range error in AVG(YEAR(datetime)) due to a wrong data type
274+
--echo #
275+
276+
let select01=SELECT ?, CAST(? AS UNSIGNED), CAST(? AS SIGNED), ABS(?), ROUND(?), -?, ROUND(?,-1), ?+0, ?+0.0, CONCAT(?), LEAST(?,?), COALESCE(?), COALESCE(?,CAST(1 AS SIGNED)), COALESCE(?,CAST(1 AS UNSIGNED)), @a:=?;
277+
let pcount01=16;
278+
let select02=SELECT AVG(?), MIN(?), MAX(?), GROUP_CONCAT(?);
279+
let pcount02=4;
280+
let ts=TIMESTAMP'2001-12-13 10:20:30.999999';
281+
282+
eval CREATE FUNCTION select01() RETURNS TEXT RETURN '$select01';
283+
eval CREATE FUNCTION select02() RETURNS TEXT RETURN '$select02';
284+
285+
CREATE TABLE t1 (a DATETIME(6));
286+
INSERT INTO t1 VALUES ('2001-12-31 10:20:30.999999');
287+
288+
DELIMITER $$;
289+
CREATE FUNCTION params(expr TEXT, count INT) RETURNS TEXT
290+
BEGIN
291+
RETURN CONCAT(expr, REPEAT(CONCAT(', ', expr), count-1));
292+
END;
293+
$$
294+
CREATE PROCEDURE show_drop()
295+
BEGIN
296+
SELECT TABLE_NAME, COLUMN_TYPE, COLUMN_NAME
297+
FROM INFORMATION_SCHEMA.COLUMNS
298+
WHERE TABLE_SCHEMA='test'
299+
AND TABLE_NAME IN ('t1e_nm','t2e_nm','t1f_nm','t2f_nm',
300+
't1e_ps','t1f_ps','t2e_ps','t2f_ps')
301+
ORDER BY LEFT(TABLE_NAME, 2), ORDINAL_POSITION, TABLE_NAME;
302+
303+
FOR rec IN (SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES
304+
WHERE TABLE_SCHEMA='test'
305+
AND TABLE_NAME IN ('t1e_nm','t2e_nm','t1f_nm','t2f_nm',
306+
't1e_ps','t1f_ps','t2e_ps','t2f_ps'))
307+
DO
308+
EXECUTE IMMEDIATE CONCAT('DROP TABLE ', rec.TABLE_NAME);
309+
END FOR;
310+
END;
311+
$$
312+
CREATE PROCEDURE p1(unit VARCHAR(32))
313+
BEGIN
314+
DECLARE do_extract BOOL DEFAULT unit NOT IN('DAYOFYEAR');
315+
316+
DECLARE query01 TEXT DEFAULT
317+
CONCAT('CREATE TABLE t2 AS ', select01(), ' FROM t1');
318+
319+
DECLARE query02 TEXT DEFAULT
320+
CONCAT('CREATE TABLE t2 AS ', select02(), ' FROM t1');
321+
322+
IF (do_extract)
323+
THEN
324+
EXECUTE IMMEDIATE REPLACE(REPLACE(query01,'t2','t1e_nm'),'?', CONCAT('EXTRACT(',unit,' FROM a)'));
325+
EXECUTE IMMEDIATE REPLACE(REPLACE(query02,'t2','t2e_nm'),'?', CONCAT('EXTRACT(',unit,' FROM a)'));
326+
END IF;
327+
EXECUTE IMMEDIATE REPLACE(REPLACE(query01,'t2','t1f_nm'),'?', CONCAT(unit,'(a)'));
328+
EXECUTE IMMEDIATE REPLACE(REPLACE(query02,'t2','t2f_nm'),'?', CONCAT(unit,'(a)'));
329+
END;
330+
$$
331+
DELIMITER ;$$
332+
333+
334+
--echo
335+
--echo
336+
--echo # EXTRACT(YEAR FROM expr) and YEAR(expr) are equivalent
337+
338+
CALL p1('YEAR');
339+
let extr=EXTRACT(YEAR FROM $ts);
340+
let func=YEAR($ts);
341+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
342+
let func01=`SELECT params("$func", $pcount01) AS p`;
343+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
344+
let func02=`SELECT params("$func", $pcount02) AS p`;
345+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
346+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
347+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
348+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
349+
CALL show_drop;
350+
351+
352+
--echo
353+
--echo
354+
--echo # EXTRACT(QUARTER FROM expr) and QUARTER(expr) are equavalent
355+
356+
CALL p1('QUARTER');
357+
let extr=EXTRACT(QUARTER FROM $ts);
358+
let func=QUARTER($ts);
359+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
360+
let func01=`SELECT params("$func", $pcount01) AS p`;
361+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
362+
let func02=`SELECT params("$func", $pcount02) AS p`;
363+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
364+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
365+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
366+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
367+
CALL show_drop;
368+
369+
--echo
370+
--echo
371+
--echo # EXTRACT(MONTH FROM expr) and MONTH(expr) are equavalent
372+
373+
CALL p1('MONTH');
374+
let extr=EXTRACT(MONTH FROM $ts);
375+
let func=MONTH($ts);
376+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
377+
let func01=`SELECT params("$func", $pcount01) AS p`;
378+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
379+
let func02=`SELECT params("$func", $pcount02) AS p`;
380+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
381+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
382+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
383+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
384+
CALL show_drop;
385+
386+
--echo
387+
--echo
388+
--echo # EXTRACT(WEEK FROM expr) and WEEK(expr) are equavalent
389+
390+
CALL p1('WEEK');
391+
let extr=EXTRACT(WEEK FROM $ts);
392+
let func=WEEK($ts);
393+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
394+
let func01=`SELECT params("$func", $pcount01) AS p`;
395+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
396+
let func02=`SELECT params("$func", $pcount02) AS p`;
397+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
398+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
399+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
400+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
401+
CALL show_drop;
402+
403+
--echo
404+
--echo
405+
--echo # EXTRACT(DAY FROM expr) returns hours/24 and includes the sign for TIME
406+
--echo # DAY(expr) returns the DD part of CAST(expr AS DATETIME)
407+
408+
CALL p1('DAY');
409+
let extr=EXTRACT(DAY FROM $ts);
410+
let func=DAY($ts);
411+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
412+
let func01=`SELECT params("$func", $pcount01) AS p`;
413+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
414+
let func02=`SELECT params("$func", $pcount02) AS p`;
415+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
416+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
417+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
418+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
419+
CALL show_drop;
420+
421+
--echo
422+
--echo
423+
--echo # EXTRACT(HOUR FROM expr) returns hours%24 and includes the sign for TIME
424+
--echo # HOUR(expr) returns the hh part of CAST(expr AS DATETIME)
425+
426+
CALL p1('HOUR');
427+
let extr=EXTRACT(HOUR FROM $ts);
428+
let func=HOUR($ts);
429+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
430+
let func01=`SELECT params("$func", $pcount01) AS p`;
431+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
432+
let func02=`SELECT params("$func", $pcount02) AS p`;
433+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
434+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
435+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
436+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
437+
CALL show_drop;
438+
439+
--echo
440+
--echo
441+
--echo # EXTRACT(MINUTE FROM expr) includes the sign for TIME
442+
--echo # MINUTE(expr) returns the absolute value
443+
444+
CALL p1('MINUTE');
445+
let extr=EXTRACT(MINUTE FROM $ts);
446+
let func=MINUTE($ts);
447+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
448+
let func01=`SELECT params("$func", $pcount01) AS p`;
449+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
450+
let func02=`SELECT params("$func", $pcount02) AS p`;
451+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
452+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
453+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
454+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
455+
CALL show_drop;
456+
457+
--echo
458+
--echo
459+
--echo # EXTRACT(SECONDS FROM expr) includes the sign for TIME
460+
--echo # SECONDS(expr) returns the absolute value
461+
462+
CALL p1('SECOND');
463+
let extr=EXTRACT(SECOND FROM $ts);
464+
let func=SECOND($ts);
465+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
466+
let func01=`SELECT params("$func", $pcount01) AS p`;
467+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
468+
let func02=`SELECT params("$func", $pcount02) AS p`;
469+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
470+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
471+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
472+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
473+
CALL show_drop;
474+
475+
--echo
476+
--echo
477+
--echo # EXTRACT(MICROSECONDS FROM expr) includes the sign for TIME
478+
--echo # MICROSECONDS(expr) returns the absolute value
479+
480+
CALL p1('MICROSECOND');
481+
let extr=EXTRACT(MICROSECOND FROM $ts);
482+
let func=MICROSECOND($ts);
483+
let extr01=`SELECT params("$extr", $pcount01) AS p`;
484+
let func01=`SELECT params("$func", $pcount01) AS p`;
485+
let extr02=`SELECT params("$extr", $pcount02) AS p`;
486+
let func02=`SELECT params("$func", $pcount02) AS p`;
487+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1e_ps AS $select01' USING $extr01;
488+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
489+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2e_ps AS $select02' USING $extr02;
490+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
491+
CALL show_drop;
492+
493+
--echo
494+
--echo
495+
--echo # DAYOFYEAR
496+
497+
CALL p1('DAYOFYEAR');
498+
let func=DAYOFYEAR($ts);
499+
let func01=`SELECT params("$func", $pcount01) AS p`;
500+
let func02=`SELECT params("$func", $pcount02) AS p`;
501+
eval EXECUTE IMMEDIATE 'CREATE TABLE t1f_ps AS $select01' USING $func01;
502+
eval EXECUTE IMMEDIATE 'CREATE TABLE t2f_ps AS $select02' USING $func02;
503+
CALL show_drop;
504+
505+
506+
DROP TABLE t1;
507+
DROP PROCEDURE p1;
508+
DROP PROCEDURE show_drop;
509+
DROP FUNCTION params;
510+
511+
DROP FUNCTION select01;
512+
DROP FUNCTION select02;
513+
514+
--echo #
515+
--echo # End of 10.5 tests
516+
--echo #

‎mysql-test/main/func_time.result‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3142,7 +3142,7 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is
31423142
def test t1 t1 a a 12 26 26 Y 128 6 63
31433143
def EXTRACT(YEAR FROM a) 3 4 4 Y 32896 0 63
31443144
def EXTRACT(YEAR_MONTH FROM a) 3 6 6 Y 32896 0 63
3145-
def EXTRACT(QUARTER FROM a) 321 Y 32896 0 63
3145+
def EXTRACT(QUARTER FROM a) 311 Y 32896 0 63
31463146
def EXTRACT(MONTH FROM a) 3 2 2 Y 32896 0 63
31473147
def EXTRACT(WEEK FROM a) 3 2 2 Y 32896 0 63
31483148
def EXTRACT(DAY FROM a) 3 3 2 Y 32896 0 63
@@ -3230,11 +3230,11 @@ SHOW CREATE TABLE t2;
32303230
Table Create Table
32313231
t2 CREATE TABLE `t2` (
32323232
`a` datetime(6) DEFAULT NULL,
3233-
`EXTRACT(YEAR FROM a)` int(4) DEFAULT NULL,
3234-
`EXTRACT(YEAR_MONTH FROM a)` int(6) DEFAULT NULL,
3233+
`EXTRACT(YEAR FROM a)` int(5) DEFAULT NULL,
3234+
`EXTRACT(YEAR_MONTH FROM a)` int(7) DEFAULT NULL,
32353235
`EXTRACT(QUARTER FROM a)` int(2) DEFAULT NULL,
3236-
`EXTRACT(MONTH FROM a)` int(2) DEFAULT NULL,
3237-
`EXTRACT(WEEK FROM a)` int(2) DEFAULT NULL,
3236+
`EXTRACT(MONTH FROM a)` int(3) DEFAULT NULL,
3237+
`EXTRACT(WEEK FROM a)` int(3) DEFAULT NULL,
32383238
`EXTRACT(DAY FROM a)` int(3) DEFAULT NULL,
32393239
`EXTRACT(DAY_HOUR FROM a)` int(5) DEFAULT NULL,
32403240
`EXTRACT(DAY_MINUTE FROM a)` int(7) DEFAULT NULL,
@@ -3281,7 +3281,7 @@ Catalog Database Table Table_alias Column Column_alias Type Length Max length Is
32813281
def test t1 t1 a a 11 17 17 Y 128 6 63
32823282
def EXTRACT(YEAR FROM a) 3 4 1 Y 32896 0 63
32833283
def EXTRACT(YEAR_MONTH FROM a) 3 6 1 Y 32896 0 63
3284-
def EXTRACT(QUARTER FROM a) 321 Y 32896 0 63
3284+
def EXTRACT(QUARTER FROM a) 311 Y 32896 0 63
32853285
def EXTRACT(MONTH FROM a) 3 2 1 Y 32896 0 63
32863286
def EXTRACT(WEEK FROM a) 3 2 9 Y 32896 0 63
32873287
def EXTRACT(DAY FROM a) 3 3 3 Y 32896 0 63
@@ -3411,11 +3411,11 @@ SHOW CREATE TABLE t2;
34113411
Table Create Table
34123412
t2 CREATE TABLE `t2` (
34133413
`a` time(6) DEFAULT NULL,
3414-
`EXTRACT(YEAR FROM a)` int(4) DEFAULT NULL,
3415-
`EXTRACT(YEAR_MONTH FROM a)` int(6) DEFAULT NULL,
3414+
`EXTRACT(YEAR FROM a)` int(5) DEFAULT NULL,
3415+
`EXTRACT(YEAR_MONTH FROM a)` int(7) DEFAULT NULL,
34163416
`EXTRACT(QUARTER FROM a)` int(2) DEFAULT NULL,
3417-
`EXTRACT(MONTH FROM a)` int(2) DEFAULT NULL,
3418-
`EXTRACT(WEEK FROM a)` int(2) DEFAULT NULL,
3417+
`EXTRACT(MONTH FROM a)` int(3) DEFAULT NULL,
3418+
`EXTRACT(WEEK FROM a)` int(3) DEFAULT NULL,
34193419
`EXTRACT(DAY FROM a)` int(3) DEFAULT NULL,
34203420
`EXTRACT(DAY_HOUR FROM a)` int(5) DEFAULT NULL,
34213421
`EXTRACT(DAY_MINUTE FROM a)` int(7) DEFAULT NULL,

‎mysql-test/main/ps_2myisam.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1798,7 +1798,7 @@ t5 CREATE TABLE `t5` (
17981798
`param09` longtext DEFAULT NULL,
17991799
`const10` bigint(17) DEFAULT NULL,
18001800
`param10` bigint(20) DEFAULT NULL,
1801-
`const11` int(4) DEFAULT NULL,
1801+
`const11` int(5) DEFAULT NULL,
18021802
`param11` bigint(20) DEFAULT NULL,
18031803
`const12` binary(0) DEFAULT NULL,
18041804
`param12` bigint(20) DEFAULT NULL,
@@ -1828,7 +1828,7 @@ def test t5 t5 const09 const09 12 19 19 Y 128 0 63
18281828
def test t5 t5 param09 param09 252 4294967295 19 Y 16 0 8
18291829
def test t5 t5 const10 const10 8 17 9 Y 32768 0 63
18301830
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
1831-
def test t5 t5 const11 const11 344 Y 32768 0 63
1831+
def test t5 t5 const11 const11 354 Y 32768 0 63
18321832
def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
18331833
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
18341834
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63

‎mysql-test/main/ps_3innodb.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,7 +1781,7 @@ t5 CREATE TABLE `t5` (
17811781
`param09` longtext DEFAULT NULL,
17821782
`const10` bigint(17) DEFAULT NULL,
17831783
`param10` bigint(20) DEFAULT NULL,
1784-
`const11` int(4) DEFAULT NULL,
1784+
`const11` int(5) DEFAULT NULL,
17851785
`param11` bigint(20) DEFAULT NULL,
17861786
`const12` binary(0) DEFAULT NULL,
17871787
`param12` bigint(20) DEFAULT NULL,
@@ -1811,7 +1811,7 @@ def test t5 t5 const09 const09 12 19 19 Y 128 0 63
18111811
def test t5 t5 param09 param09 252 4294967295 19 Y 16 0 8
18121812
def test t5 t5 const10 const10 8 17 9 Y 32768 0 63
18131813
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
1814-
def test t5 t5 const11 const11 344 Y 32768 0 63
1814+
def test t5 t5 const11 const11 354 Y 32768 0 63
18151815
def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
18161816
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
18171817
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63

‎mysql-test/main/ps_4heap.result‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1782,7 +1782,7 @@ t5 CREATE TABLE `t5` (
17821782
`param09` longtext DEFAULT NULL,
17831783
`const10` bigint(17) DEFAULT NULL,
17841784
`param10` bigint(20) DEFAULT NULL,
1785-
`const11` int(4) DEFAULT NULL,
1785+
`const11` int(5) DEFAULT NULL,
17861786
`param11` bigint(20) DEFAULT NULL,
17871787
`const12` binary(0) DEFAULT NULL,
17881788
`param12` bigint(20) DEFAULT NULL,
@@ -1812,7 +1812,7 @@ def test t5 t5 const09 const09 12 19 19 Y 128 0 63
18121812
def test t5 t5 param09 param09 252 4294967295 19 Y 16 0 8
18131813
def test t5 t5 const10 const10 8 17 9 Y 32768 0 63
18141814
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
1815-
def test t5 t5 const11 const11 344 Y 32768 0 63
1815+
def test t5 t5 const11 const11 354 Y 32768 0 63
18161816
def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
18171817
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
18181818
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63

‎mysql-test/main/ps_5merge.result‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ t5 CREATE TABLE `t5` (
17191719
`param09` longtext DEFAULT NULL,
17201720
`const10` bigint(17) DEFAULT NULL,
17211721
`param10` bigint(20) DEFAULT NULL,
1722-
`const11` int(4) DEFAULT NULL,
1722+
`const11` int(5) DEFAULT NULL,
17231723
`param11` bigint(20) DEFAULT NULL,
17241724
`const12` binary(0) DEFAULT NULL,
17251725
`param12` bigint(20) DEFAULT NULL,
@@ -1749,7 +1749,7 @@ def test t5 t5 const09 const09 12 19 19 Y 128 0 63
17491749
def test t5 t5 param09 param09 252 4294967295 19 Y 16 0 8
17501750
def test t5 t5 const10 const10 8 17 9 Y 32768 0 63
17511751
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
1752-
def test t5 t5 const11 const11 344 Y 32768 0 63
1752+
def test t5 t5 const11 const11 354 Y 32768 0 63
17531753
def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
17541754
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
17551755
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63
@@ -5087,7 +5087,7 @@ t5 CREATE TABLE `t5` (
50875087
`param09` longtext DEFAULT NULL,
50885088
`const10` bigint(17) DEFAULT NULL,
50895089
`param10` bigint(20) DEFAULT NULL,
5090-
`const11` int(4) DEFAULT NULL,
5090+
`const11` int(5) DEFAULT NULL,
50915091
`param11` bigint(20) DEFAULT NULL,
50925092
`const12` binary(0) DEFAULT NULL,
50935093
`param12` bigint(20) DEFAULT NULL,
@@ -5117,7 +5117,7 @@ def test t5 t5 const09 const09 12 19 19 Y 128 0 63
51175117
def test t5 t5 param09 param09 252 4294967295 19 Y 16 0 8
51185118
def test t5 t5 const10 const10 8 17 9 Y 32768 0 63
51195119
def test t5 t5 param10 param10 8 20 9 Y 32768 0 63
5120-
def test t5 t5 const11 const11 344 Y 32768 0 63
5120+
def test t5 t5 const11 const11 354 Y 32768 0 63
51215121
def test t5 t5 param11 param11 8 20 4 Y 32768 0 63
51225122
def test t5 t5 const12 const12 254 0 0 Y 128 0 63
51235123
def test t5 t5 param12 param12 8 20 0 Y 32768 0 63

0 commit comments

Comments
 (0)