summaryrefslogtreecommitdiff
path: root/mysql-test/r/warnings.result
diff options
context:
space:
mode:
authorMagnus Svensson <msvensson@mysql.com>2008-05-30 11:12:07 +0200
committerMagnus Svensson <msvensson@mysql.com>2008-05-30 11:12:07 +0200
commit867b60e08be9887aa6b7a61b763f44edcca1c221 (patch)
tree2c436ada208ddcfb89206130a251a9bc72631891 /mysql-test/r/warnings.result
parentecc6795c45fc676dca657d4144cc5e5a6ec47e70 (diff)
parent14aef9781ad64ab89e1bf61ad8a09565f14f5147 (diff)
downloadmariadb-git-867b60e08be9887aa6b7a61b763f44edcca1c221.tar.gz
Merge 5.1->5.1-rpl
Fix paths and name of a few files to make it work with new mtr.pl
Diffstat (limited to 'mysql-test/r/warnings.result')
-rw-r--r--mysql-test/r/warnings.result2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/r/warnings.result b/mysql-test/r/warnings.result
index 46fdace9125..a4237597646 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);