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/heap.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/heap.result')
| -rw-r--r-- | mysql-test/r/heap.result | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/heap.result b/mysql-test/r/heap.result index a2c208ee3e1..ddf675e2f73 100644 --- a/mysql-test/r/heap.result +++ b/mysql-test/r/heap.result @@ -256,7 +256,6 @@ set @a=repeat(' ',20); insert into t1 values (concat('+',@a),concat('+',@a),concat('+',@a)); Warnings: Note 1265 Data truncated for column 'v' at row 1 -Note 1265 Data truncated for column 'c' at row 1 select concat('*',v,'*',c,'*',t,'*') from t1; concat('*',v,'*',c,'*',t,'*') *+ *+*+ * |