diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-05-13 17:01:02 +0500 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-05-13 17:01:02 +0500 |
| commit | ff1588ca83b930ca0ea91b986eef9c3920377761 (patch) | |
| tree | 5293fb87da5564cff8469a97582af3fb74b5f76b /mysql-test/r/warnings.result | |
| parent | d1345c67155936716c262ffb64083017269cdf45 (diff) | |
| parent | 5a1b7ddb683a34c0a512c890a11170e0b0b14da2 (diff) | |
| download | mariadb-git-ff1588ca83b930ca0ea91b986eef9c3920377761.tar.gz | |
Merge host.loc:/work/bugs/5.0-bugteam-30059
into host.loc:/work/bk/5.1-bugteam
mysql-test/r/heap.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
mysql-test/r/myisam.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/type_binary.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
BitKeeper/deleted/.del-bdb.result:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
Diffstat (limited to 'mysql-test/r/warnings.result')
| -rw-r--r-- | mysql-test/r/warnings.result | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result index 653309efa42..aad8a33ea61 100644 --- a/mysql-test/r/warnings.result +++ b/mysql-test/r/warnings.result @@ -283,7 +283,6 @@ set @q = repeat('q', 256); set sql_mode = ''; insert into t1 values(@c, @c, @c); Warnings: -Note 1265 Data truncated for column 'c_char' at row 1 Note 1265 Data truncated for column 'c_varchar' at row 1 Note 1265 Data truncated for column 'c_tinytext' at row 1 insert into t2 values(@c); @@ -300,7 +299,6 @@ Warning 1265 Data truncated for column 'c_tinyblob' at row 1 set sql_mode = 'traditional'; insert into t1 values(@c, @c, @c); Warnings: -Note 1265 Data truncated for column 'c_char' at row 1 Note 1265 Data truncated for column 'c_varchar' at row 1 Note 1265 Data truncated for column 'c_tinytext' at row 1 insert into t2 values(@c); |