1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-26681: ROW_NUMBER is not available within compound statement blocks

Browse Source 
Fixed after patch MDEV-26606 because root cause was same.

Analysis: m_current_row_for_warning is reset to 1 during cleanup phase of
stored procedure. When we perform a copy because some statement of procedure
created warning, this reset value is passed to push _warning().
Fix: Add a parameter in relevant functions to pass correct value of
error index and don't use m_current_row_for_warning directly.
This commit is contained in:
Rucha Deodhar 2021-10-06 23:43:16 +05:30
parent af95c991dd
commit 5cc9cf9a05
3 changed files with 65 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mysql-test/main/get_diagnostics.result
View File

@ -1638,3 +1638,36 @@ SELECT @ind, @msg;
@ind @msg
0 Invalid condition number
DROP TABLE t1;
#
# MDEV-26681: ROW_NUMBER is not available within compound statement blocks
#
CREATE OR REPLACE TABLE t1 (pk INT PRIMARY KEY, a CHAR(3));
INSERT IGNORE INTO t1 VALUES (1,'foo'),(1,'bar'),(2,'foobar');
Warnings:
Warning 1062 Duplicate entry '1' for key 'PRIMARY'
Warning 1265 Data truncated for column 'a' at row 3
BEGIN NOT ATOMIC
DECLARE i INT DEFAULT 0;
DECLARE rnum INT DEFAULT -1;
DECLARE msg VARCHAR(1024) DEFAULT '';
DECLARE err INT DEFAULT -1;
WHILE i < @@warning_count
DO
SET i = i + 1;
GET DIAGNOSTICS CONDITION i rnum = ROW_NUMBER, msg = MESSAGE_TEXT, err = MYSQL_ERRNO;
SELECT i, rnum, msg, err;
END WHILE;
END |
i rnum msg err
1 2 Duplicate entry '1' for key 'PRIMARY' 1062
i rnum msg err
2 3 Data truncated for column 'a' at row 3 1265
GET DIAGNOSTICS CONDITION 1 @rnum = ROW_NUMBER, @msg = MESSAGE_TEXT, @err = MYSQL_ERRNO;
select @rnum, @msg, @err;
@rnum @msg @err
2 Duplicate entry '1' for key 'PRIMARY' 1062
GET DIAGNOSTICS CONDITION 2 @rnum = ROW_NUMBER, @msg = MESSAGE_TEXT, @err = MYSQL_ERRNO;
SELECT @rnum, @msg, @err;
@rnum @msg @err
3 Data truncated for column 'a' at row 3 1265
DROP TABLE t1;

32
mysql-test/main/get_diagnostics.test
View File

@ -1520,3 +1520,35 @@ GET DIAGNOSTICS CONDITION 5 @ind = ROW_NUMBER, @msg = MESSAGE_TEXT;
SELECT @ind, @msg;
DROP TABLE t1;
--echo #
--echo # MDEV-26681: ROW_NUMBER is not available within compound statement blocks
--echo #
CREATE OR REPLACE TABLE t1 (pk INT PRIMARY KEY, a CHAR(3));
INSERT IGNORE INTO t1 VALUES (1,'foo'),(1,'bar'),(2,'foobar');
DELIMITER |;
BEGIN NOT ATOMIC
DECLARE i INT DEFAULT 0;
DECLARE rnum INT DEFAULT -1;
DECLARE msg VARCHAR(1024) DEFAULT '';
DECLARE err INT DEFAULT -1;
WHILE i < @@warning_count
DO
SET i = i + 1;
GET DIAGNOSTICS CONDITION i rnum = ROW_NUMBER, msg = MESSAGE_TEXT, err = MYSQL_ERRNO;
SELECT i, rnum, msg, err;
END WHILE;
END |
DELIMITER ;|
GET DIAGNOSTICS CONDITION 1 @rnum = ROW_NUMBER, @msg = MESSAGE_TEXT, @err = MYSQL_ERRNO;
select @rnum, @msg, @err;
GET DIAGNOSTICS CONDITION 2 @rnum = ROW_NUMBER, @msg = MESSAGE_TEXT, @err = MYSQL_ERRNO;
SELECT @rnum, @msg, @err;
DROP TABLE t1;

2
sql/lex.h
View File

@ -567,8 +567,6 @@ SYMBOL symbols[] = {
{ "ROWS", SYM(ROWS_SYM)},
{ "ROWTYPE", SYM(ROWTYPE_MARIADB_SYM)},
{ "ROW_COUNT", SYM(ROW_COUNT_SYM)},
/** sql_function and condition_property_name for GET DIAGNOSTICS */
{ "ROW_NUMBER", SYM(ROW_NUMBER_SYM)},
{ "ROW_FORMAT", SYM(ROW_FORMAT_SYM)},
/** sql_function and condition_property_name for GET DIAGNOSTICS */
{ "ROW_NUMBER", SYM(ROW_NUMBER_SYM)},