diff options
| author | Rucha Deodhar <rucha.deodhar@mariadb.com> | 2021-10-17 16:24:31 +0530 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-10-26 17:29:40 +0200 |
| commit | 797bd73cfa09e002819e847bd1aa9fea79dc5d9f (patch) | |
| tree | 02ba746c3781e79a88e1ba82004dd6af3f547830 /mysql-test/main | |
| parent | 635be990ca95181ddb7f97da982292ba291e3fd2 (diff) | |
| download | mariadb-git-797bd73cfa09e002819e847bd1aa9fea79dc5d9f.tar.gz | |
MDEV-26841: ROW_NUMBER is not set and differs from the message upon
ER_WRONG_VALUE_COUNT_ON_ROW for the 1st row
Analysis: Current row for warning does not increment for prepare phase
Fix: Increment current row for warning if number of fields in the table and
row values dont match and number of values in rows is greater than number
of fields
Diffstat (limited to 'mysql-test/main')
| -rw-r--r-- | mysql-test/main/get_diagnostics.result | 18 | ||||
| -rw-r--r-- | mysql-test/main/get_diagnostics.test | 21 |
2 files changed, 39 insertions, 0 deletions
diff --git a/mysql-test/main/get_diagnostics.result b/mysql-test/main/get_diagnostics.result index d394d96eaff..6b01cbd78e0 100644 --- a/mysql-test/main/get_diagnostics.result +++ b/mysql-test/main/get_diagnostics.result @@ -1747,3 +1747,21 @@ SELECT @n, @m; @n @m 2 Data truncated for column 'a' at row 2 DROP TABLE t1; +# +# MDEV-26841: ROW_NUMBER is not set and differs from the message upon +# ER_WRONG_VALUE_COUNT_ON_ROW for the 1st row +# +CREATE TABLE t1 (a INT); +INSERT INTO t1 VALUES (1,2),(3); +ERROR 21S01: Column count doesn't match value count at row 1 +GET DIAGNOSTICS CONDITION 1 @n= ROW_NUMBER, @m= MESSAGE_TEXT; +SELECT @n, @m; +@n @m +1 Column count doesn't match value count at row 1 +INSERT INTO t1(a) VALUES(1,2), (3); +ERROR 21S01: Column count doesn't match value count at row 1 +GET DIAGNOSTICS CONDITION 1 @n= ROW_NUMBER, @m= MESSAGE_TEXT; +SELECT @n, @m; +@n @m +1 Column count doesn't match value count at row 1 +DROP TABLE t1; diff --git a/mysql-test/main/get_diagnostics.test b/mysql-test/main/get_diagnostics.test index f4495059f9c..623d9a9a686 100644 --- a/mysql-test/main/get_diagnostics.test +++ b/mysql-test/main/get_diagnostics.test @@ -1632,3 +1632,24 @@ GET DIAGNOSTICS CONDITION 1 @n= ROW_NUMBER, @m= MESSAGE_TEXT; SELECT @n, @m; DROP TABLE t1; + +--echo # +--echo # MDEV-26841: ROW_NUMBER is not set and differs from the message upon +--echo # ER_WRONG_VALUE_COUNT_ON_ROW for the 1st row +--echo # + +CREATE TABLE t1 (a INT); + +--error ER_WRONG_VALUE_COUNT_ON_ROW +INSERT INTO t1 VALUES (1,2),(3); + +GET DIAGNOSTICS CONDITION 1 @n= ROW_NUMBER, @m= MESSAGE_TEXT; +SELECT @n, @m; + +--error ER_WRONG_VALUE_COUNT_ON_ROW +INSERT INTO t1(a) VALUES(1,2), (3); + +GET DIAGNOSTICS CONDITION 1 @n= ROW_NUMBER, @m= MESSAGE_TEXT; +SELECT @n, @m; + +DROP TABLE t1; |