Skip to content

Commit c4ab352

Browse files
author
Alexey Botchkov
committed
MDEV-14576 Include full name of object in message about incorrect value for column.
The error message modified. Then the TABLE_SHARE::error_table_name() implementation taken from 10.3, to be used as a name of the table in this message.
1 parent 0a2eddd commit c4ab352

File tree

100 files changed

+1494
-1422
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+1494
-1422
lines changed

‎mysql-test/r/alter_table.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -751,12 +751,12 @@ create table t1(f1 int);
751751
alter table t1 add column f2 datetime not null, add column f21 date not null;
752752
insert into t1 values(1,'2000-01-01','2000-01-01');
753753
alter table t1 add column f3 datetime not null;
754-
ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'f3' at row 1
754+
ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t1`.`f3` at row 1
755755
alter table t1 add column f3 date not null;
756-
ERROR 22007: Incorrect date value: '0000-00-00' for column 'f3' at row 1
756+
ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f3` at row 1
757757
alter table t1 add column f4 datetime not null default '2002-02-02',
758758
add column f41 date not null;
759-
ERROR 22007: Incorrect date value: '0000-00-00' for column 'f41' at row 1
759+
ERROR 22007: Incorrect date value: '0000-00-00' for column `test`.`t1`.`f41` at row 1
760760
alter table t1 add column f4 datetime not null default '2002-02-02',
761761
add column f41 date not null default '2002-02-02';
762762
select * from t1;

‎mysql-test/r/create.result

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ INSERT INTO t3 VALUES (0);
12251225
SET sql_mode = TRADITIONAL;
12261226

12271227
ALTER TABLE t3 ADD INDEX(c1);
1228-
ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column 'c1' at row 1
1228+
ERROR 22007: Incorrect datetime value: '0000-00-00 00:00:00' for column `test`.`t3`.`c1` at row 1
12291229

12301230
# -- Cleanup.
12311231
SET sql_mode = '';
@@ -1783,12 +1783,12 @@ NULL 0000-00-00 0000-00-00
17831783
drop table t1;
17841784
set @@session.sql_mode='STRICT_ALL_TABLES';
17851785
create table if not exists t1 (a int, b date, c date) select 1 as b, 2 as c;
1786-
ERROR 22007: Incorrect date value: '1' for column 'b' at row 1
1786+
ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1
17871787
select * from t1;
17881788
ERROR 42S02: Table 'test.t1' doesn't exist
17891789
create table if not exists t1 (a int, b date, c date)
17901790
replace select 1 as b, 2 as c;
1791-
ERROR 22007: Incorrect date value: '1' for column 'b' at row 1
1791+
ERROR 22007: Incorrect date value: '1' for column `test`.`t1`.`b` at row 1
17921792
select * from t1;
17931793
ERROR 42S02: Table 'test.t1' doesn't exist
17941794
create table if not exists t1 (a int, b date, c date)

‎mysql-test/r/ctype_big5.result

Lines changed: 64 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -565,70 +565,70 @@ COUNT(*)
565565
28672
566566
UPDATE IGNORE t1 SET a=unhex(code) ORDER BY code;
567567
Warnings:
568-
Warning 1366 Incorrect string value: '\x80 ' for column 'a' at row 1
569-
Warning 1366 Incorrect string value: '\x80!' for column 'a' at row 2
570-
Warning 1366 Incorrect string value: '\x80"' for column 'a' at row 3
571-
Warning 1366 Incorrect string value: '\x80#' for column 'a' at row 4
572-
Warning 1366 Incorrect string value: '\x80$' for column 'a' at row 5
573-
Warning 1366 Incorrect string value: '\x80%' for column 'a' at row 6
574-
Warning 1366 Incorrect string value: '\x80&' for column 'a' at row 7
575-
Warning 1366 Incorrect string value: '\x80'' for column 'a' at row 8
576-
Warning 1366 Incorrect string value: '\x80(' for column 'a' at row 9
577-
Warning 1366 Incorrect string value: '\x80)' for column 'a' at row 10
578-
Warning 1366 Incorrect string value: '\x80*' for column 'a' at row 11
579-
Warning 1366 Incorrect string value: '\x80+' for column 'a' at row 12
580-
Warning 1366 Incorrect string value: '\x80,' for column 'a' at row 13
581-
Warning 1366 Incorrect string value: '\x80-' for column 'a' at row 14
582-
Warning 1366 Incorrect string value: '\x80.' for column 'a' at row 15
583-
Warning 1366 Incorrect string value: '\x80/' for column 'a' at row 16
584-
Warning 1366 Incorrect string value: '\x800' for column 'a' at row 17
585-
Warning 1366 Incorrect string value: '\x801' for column 'a' at row 18
586-
Warning 1366 Incorrect string value: '\x802' for column 'a' at row 19
587-
Warning 1366 Incorrect string value: '\x803' for column 'a' at row 20
588-
Warning 1366 Incorrect string value: '\x804' for column 'a' at row 21
589-
Warning 1366 Incorrect string value: '\x805' for column 'a' at row 22
590-
Warning 1366 Incorrect string value: '\x806' for column 'a' at row 23
591-
Warning 1366 Incorrect string value: '\x807' for column 'a' at row 24
592-
Warning 1366 Incorrect string value: '\x808' for column 'a' at row 25
593-
Warning 1366 Incorrect string value: '\x809' for column 'a' at row 26
594-
Warning 1366 Incorrect string value: '\x80:' for column 'a' at row 27
595-
Warning 1366 Incorrect string value: '\x80;' for column 'a' at row 28
596-
Warning 1366 Incorrect string value: '\x80<' for column 'a' at row 29
597-
Warning 1366 Incorrect string value: '\x80=' for column 'a' at row 30
598-
Warning 1366 Incorrect string value: '\x80>' for column 'a' at row 31
599-
Warning 1366 Incorrect string value: '\x80?' for column 'a' at row 32
600-
Warning 1366 Incorrect string value: '\x80@' for column 'a' at row 33
601-
Warning 1366 Incorrect string value: '\x80A' for column 'a' at row 34
602-
Warning 1366 Incorrect string value: '\x80B' for column 'a' at row 35
603-
Warning 1366 Incorrect string value: '\x80C' for column 'a' at row 36
604-
Warning 1366 Incorrect string value: '\x80D' for column 'a' at row 37
605-
Warning 1366 Incorrect string value: '\x80E' for column 'a' at row 38
606-
Warning 1366 Incorrect string value: '\x80F' for column 'a' at row 39
607-
Warning 1366 Incorrect string value: '\x80G' for column 'a' at row 40
608-
Warning 1366 Incorrect string value: '\x80H' for column 'a' at row 41
609-
Warning 1366 Incorrect string value: '\x80I' for column 'a' at row 42
610-
Warning 1366 Incorrect string value: '\x80J' for column 'a' at row 43
611-
Warning 1366 Incorrect string value: '\x80K' for column 'a' at row 44
612-
Warning 1366 Incorrect string value: '\x80L' for column 'a' at row 45
613-
Warning 1366 Incorrect string value: '\x80M' for column 'a' at row 46
614-
Warning 1366 Incorrect string value: '\x80N' for column 'a' at row 47
615-
Warning 1366 Incorrect string value: '\x80O' for column 'a' at row 48
616-
Warning 1366 Incorrect string value: '\x80P' for column 'a' at row 49
617-
Warning 1366 Incorrect string value: '\x80Q' for column 'a' at row 50
618-
Warning 1366 Incorrect string value: '\x80R' for column 'a' at row 51
619-
Warning 1366 Incorrect string value: '\x80S' for column 'a' at row 52
620-
Warning 1366 Incorrect string value: '\x80T' for column 'a' at row 53
621-
Warning 1366 Incorrect string value: '\x80U' for column 'a' at row 54
622-
Warning 1366 Incorrect string value: '\x80V' for column 'a' at row 55
623-
Warning 1366 Incorrect string value: '\x80W' for column 'a' at row 56
624-
Warning 1366 Incorrect string value: '\x80X' for column 'a' at row 57
625-
Warning 1366 Incorrect string value: '\x80Y' for column 'a' at row 58
626-
Warning 1366 Incorrect string value: '\x80Z' for column 'a' at row 59
627-
Warning 1366 Incorrect string value: '\x80[' for column 'a' at row 60
628-
Warning 1366 Incorrect string value: '\x80\' for column 'a' at row 61
629-
Warning 1366 Incorrect string value: '\x80]' for column 'a' at row 62
630-
Warning 1366 Incorrect string value: '\x80^' for column 'a' at row 63
631-
Warning 1366 Incorrect string value: '\x80_' for column 'a' at row 64
568+
Warning 1366 Incorrect string value: '\x80 ' for column `test`.`t1`.`a` at row 1
569+
Warning 1366 Incorrect string value: '\x80!' for column `test`.`t1`.`a` at row 2
570+
Warning 1366 Incorrect string value: '\x80"' for column `test`.`t1`.`a` at row 3
571+
Warning 1366 Incorrect string value: '\x80#' for column `test`.`t1`.`a` at row 4
572+
Warning 1366 Incorrect string value: '\x80$' for column `test`.`t1`.`a` at row 5
573+
Warning 1366 Incorrect string value: '\x80%' for column `test`.`t1`.`a` at row 6
574+
Warning 1366 Incorrect string value: '\x80&' for column `test`.`t1`.`a` at row 7
575+
Warning 1366 Incorrect string value: '\x80'' for column `test`.`t1`.`a` at row 8
576+
Warning 1366 Incorrect string value: '\x80(' for column `test`.`t1`.`a` at row 9
577+
Warning 1366 Incorrect string value: '\x80)' for column `test`.`t1`.`a` at row 10
578+
Warning 1366 Incorrect string value: '\x80*' for column `test`.`t1`.`a` at row 11
579+
Warning 1366 Incorrect string value: '\x80+' for column `test`.`t1`.`a` at row 12
580+
Warning 1366 Incorrect string value: '\x80,' for column `test`.`t1`.`a` at row 13
581+
Warning 1366 Incorrect string value: '\x80-' for column `test`.`t1`.`a` at row 14
582+
Warning 1366 Incorrect string value: '\x80.' for column `test`.`t1`.`a` at row 15
583+
Warning 1366 Incorrect string value: '\x80/' for column `test`.`t1`.`a` at row 16
584+
Warning 1366 Incorrect string value: '\x800' for column `test`.`t1`.`a` at row 17
585+
Warning 1366 Incorrect string value: '\x801' for column `test`.`t1`.`a` at row 18
586+
Warning 1366 Incorrect string value: '\x802' for column `test`.`t1`.`a` at row 19
587+
Warning 1366 Incorrect string value: '\x803' for column `test`.`t1`.`a` at row 20
588+
Warning 1366 Incorrect string value: '\x804' for column `test`.`t1`.`a` at row 21
589+
Warning 1366 Incorrect string value: '\x805' for column `test`.`t1`.`a` at row 22
590+
Warning 1366 Incorrect string value: '\x806' for column `test`.`t1`.`a` at row 23
591+
Warning 1366 Incorrect string value: '\x807' for column `test`.`t1`.`a` at row 24
592+
Warning 1366 Incorrect string value: '\x808' for column `test`.`t1`.`a` at row 25
593+
Warning 1366 Incorrect string value: '\x809' for column `test`.`t1`.`a` at row 26
594+
Warning 1366 Incorrect string value: '\x80:' for column `test`.`t1`.`a` at row 27
595+
Warning 1366 Incorrect string value: '\x80;' for column `test`.`t1`.`a` at row 28
596+
Warning 1366 Incorrect string value: '\x80<' for column `test`.`t1`.`a` at row 29
597+
Warning 1366 Incorrect string value: '\x80=' for column `test`.`t1`.`a` at row 30
598+
Warning 1366 Incorrect string value: '\x80>' for column `test`.`t1`.`a` at row 31
599+
Warning 1366 Incorrect string value: '\x80?' for column `test`.`t1`.`a` at row 32
600+
Warning 1366 Incorrect string value: '\x80@' for column `test`.`t1`.`a` at row 33
601+
Warning 1366 Incorrect string value: '\x80A' for column `test`.`t1`.`a` at row 34
602+
Warning 1366 Incorrect string value: '\x80B' for column `test`.`t1`.`a` at row 35
603+
Warning 1366 Incorrect string value: '\x80C' for column `test`.`t1`.`a` at row 36
604+
Warning 1366 Incorrect string value: '\x80D' for column `test`.`t1`.`a` at row 37
605+
Warning 1366 Incorrect string value: '\x80E' for column `test`.`t1`.`a` at row 38
606+
Warning 1366 Incorrect string value: '\x80F' for column `test`.`t1`.`a` at row 39
607+
Warning 1366 Incorrect string value: '\x80G' for column `test`.`t1`.`a` at row 40
608+
Warning 1366 Incorrect string value: '\x80H' for column `test`.`t1`.`a` at row 41
609+
Warning 1366 Incorrect string value: '\x80I' for column `test`.`t1`.`a` at row 42
610+
Warning 1366 Incorrect string value: '\x80J' for column `test`.`t1`.`a` at row 43
611+
Warning 1366 Incorrect string value: '\x80K' for column `test`.`t1`.`a` at row 44
612+
Warning 1366 Incorrect string value: '\x80L' for column `test`.`t1`.`a` at row 45
613+
Warning 1366 Incorrect string value: '\x80M' for column `test`.`t1`.`a` at row 46
614+
Warning 1366 Incorrect string value: '\x80N' for column `test`.`t1`.`a` at row 47
615+
Warning 1366 Incorrect string value: '\x80O' for column `test`.`t1`.`a` at row 48
616+
Warning 1366 Incorrect string value: '\x80P' for column `test`.`t1`.`a` at row 49
617+
Warning 1366 Incorrect string value: '\x80Q' for column `test`.`t1`.`a` at row 50
618+
Warning 1366 Incorrect string value: '\x80R' for column `test`.`t1`.`a` at row 51
619+
Warning 1366 Incorrect string value: '\x80S' for column `test`.`t1`.`a` at row 52
620+
Warning 1366 Incorrect string value: '\x80T' for column `test`.`t1`.`a` at row 53
621+
Warning 1366 Incorrect string value: '\x80U' for column `test`.`t1`.`a` at row 54
622+
Warning 1366 Incorrect string value: '\x80V' for column `test`.`t1`.`a` at row 55
623+
Warning 1366 Incorrect string value: '\x80W' for column `test`.`t1`.`a` at row 56
624+
Warning 1366 Incorrect string value: '\x80X' for column `test`.`t1`.`a` at row 57
625+
Warning 1366 Incorrect string value: '\x80Y' for column `test`.`t1`.`a` at row 58
626+
Warning 1366 Incorrect string value: '\x80Z' for column `test`.`t1`.`a` at row 59
627+
Warning 1366 Incorrect string value: '\x80[' for column `test`.`t1`.`a` at row 60
628+
Warning 1366 Incorrect string value: '\x80\' for column `test`.`t1`.`a` at row 61
629+
Warning 1366 Incorrect string value: '\x80]' for column `test`.`t1`.`a` at row 62
630+
Warning 1366 Incorrect string value: '\x80^' for column `test`.`t1`.`a` at row 63
631+
Warning 1366 Incorrect string value: '\x80_' for column `test`.`t1`.`a` at row 64
632632
SELECT COUNT(*) FROM t1 WHERE a<>'?';
633633
COUNT(*)
634634
13973

0 commit comments

Comments
 (0)