diff options
| author | unknown <jimw@mysql.com> | 2005-04-05 19:45:34 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-04-05 19:45:34 -0700 |
| commit | 5cdec5d6ba0c3fac2fe312da3e98c9506091a0a7 (patch) | |
| tree | b51927fa62cfdff1d3b10fd3678491743e115f13 /mysql-test/r/warnings.result | |
| parent | 51653cb239a715c754c1e8a7352fedf47393a872 (diff) | |
| parent | 2f19824d20c49b244c89c008437eb6c1281222b3 (diff) | |
| download | mariadb-git-5cdec5d6ba0c3fac2fe312da3e98c9506091a0a7.tar.gz | |
Merge
mysql-test/r/create.result:
Auto merged
mysql-test/r/ctype_latin1_de.result:
Auto merged
mysql-test/r/grant.result:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/limit.result:
Auto merged
mysql-test/r/order_by.result:
Auto merged
mysql-test/r/rpl000001.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_blob.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/ctype_latin1_de.test:
Auto merged
mysql-test/t/limit.test:
Auto merged
mysql-test/t/order_by.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/type_blob.test:
Auto merged
mysql-test/t/type_ranges.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_insert.cc:
Auto merged
mysql-test/t/strict.test:
SCCS merged
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index d143b66ae94..442d0784953 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -117,10 +117,12 @@ Warning 1263 Column set to default value; NULL supplied to NOT NULL column 'a' a Warning 1265 Data truncated for column 'b' at row 4 insert into t2(b) values('mysqlab'); Warnings: +Warning 1364 Field 'a' doesn't have a default value Warning 1265 Data truncated for column 'b' at row 1 set sql_warnings=1; insert into t2(b) values('mysqlab'); Warnings: +Warning 1364 Field 'a' doesn't have a default value Warning 1265 Data truncated for column 'b' at row 1 set sql_warnings=0; drop table t1, t2; |