diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2018-12-16 02:21:41 +0400 |
| commit | c4ab352b670618bb478138cfbf3ed195317b3ccb (patch) | |
| tree | 3dc86ad7d504865798871ae869ab5bac40e804b2 /mysql-test/r/loaddata.result | |
| parent | 0a2edddbf4f4737863edf51970cbbaa91e72e11f (diff) | |
| download | mariadb-git-c4ab352b670618bb478138cfbf3ed195317b3ccb.tar.gz | |
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.
Diffstat (limited to 'mysql-test/r/loaddata.result')
| -rw-r--r-- | mysql-test/r/loaddata.result | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysql-test/r/loaddata.result b/mysql-test/r/loaddata.result index 4f59e9cdbe3..eda4f12291a 100644 --- a/mysql-test/r/loaddata.result +++ b/mysql-test/r/loaddata.result @@ -45,10 +45,10 @@ load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated Warnings: Note 1265 Data truncated for column 'a' at row 1 Note 1265 Data truncated for column 'a' at row 2 -Warning 1366 Incorrect integer value: 'error ' for column 'a' at row 3 +Warning 1366 Incorrect integer value: 'error ' for column `test`.`t1`.`a` at row 3 Warning 1262 Row 3 was truncated; it contained more data than there were input columns Note 1265 Data truncated for column 'a' at row 4 -Warning 1366 Incorrect integer value: 'wrong end ' for column 'a' at row 5 +Warning 1366 Incorrect integer value: 'wrong end ' for column `test`.`t1`.`a` at row 5 Warning 1262 Row 5 was truncated; it contained more data than there were input columns select * from t1; a b @@ -64,7 +64,7 @@ Note 1265 Data truncated for column 'a' at row 1 Note 1265 Data truncated for column 'a' at row 2 Note 1265 Data truncated for column 'a' at row 3 Warning 1366 Incorrect integer value: ' -' for column 'a' at row 4 +' for column `test`.`t1`.`a` at row 4 Warning 1261 Row 4 doesn't contain data for all columns select * from t1; a b |