summaryrefslogtreecommitdiff
path: root/mysql-test/r/warnings.result
diff options
context:
space:
mode:
authorunknown <pgalbraith/patg@govinda.patg.net>2006-08-16 17:16:36 -0700
committerunknown <pgalbraith/patg@govinda.patg.net>2006-08-16 17:16:36 -0700
commit2eb9eb9f54e5b44ed524ef8bf6aaa9dd724c8fb4 (patch)
tree9380832722e48f02666039e6d763effa2c870f40 /mysql-test/r/warnings.result
parent8ef847ea42ddccd74ee0a0888f8c09df701c2532 (diff)
downloadmariadb-git-2eb9eb9f54e5b44ed524ef8bf6aaa9dd724c8fb4.tar.gz
test result changes (non-functional) for 5.1-5.0 merge
mysql-test/r/federated_transactions.result: merge fixes to result file (case sensitivity) mysql-test/r/warnings.result: wrong warning message result
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 a2161a02475..16a7f1a84da 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 was set to data type implicit default; NULL supplied for 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