summaryrefslogtreecommitdiff
path: root/mysql-test/r/warnings.result
diff options
context:
space:
mode:
authorunknown <pgalbraith/patg@govinda.patg.net>2006-08-16 20:39:33 -0700
committerunknown <pgalbraith/patg@govinda.patg.net>2006-08-16 20:39:33 -0700
commit0073d9be28f42e7d6856e6c6e9496b4fa65d0868 (patch)
tree90ad04c0f01aa04cdc80c1dc61897aaedea26884 /mysql-test/r/warnings.result
parent2eb9eb9f54e5b44ed524ef8bf6aaa9dd724c8fb4 (diff)
downloadmariadb-git-0073d9be28f42e7d6856e6c6e9496b4fa65d0868.tar.gz
merge warning test results (!)
Diffstat (limited to 'mysql-test/r/warnings.result')
-rw-r--r--mysql-test/r/warnings.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 16a7f1a84da..26b3c1625aa 100644
--- a/mysql-test/r/warnings.result
+++ b/mysql-test/r/warnings.result
@@ -72,7 +72,7 @@ drop table t1;
create table t1(a tinyint, b int not null, c date, d char(5));
load data infile '../std_data_ln/warnings_loaddata.dat' into table t1 fields terminated by ',';
Warnings:
-Warning 1263 Column was set to data type implicit default; NULL supplied for NOT NULL column 'b' at row 2
+Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'b' at row 2
Warning 1265 Data truncated for column 'd' at row 3
Warning 1265 Data truncated for column 'c' at row 4
Warning 1261 Row 5 doesn't contain data for all columns