bk commit into 6.0 tree (mleich:1.2648)

[mleich]

Below is the list of changes that have just been committed into a local
6.0 repository of mleich.  When mleich does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-05-05 21:21:21+02:00, mleich@stripped +1 -0
  Post merge fix for
       ChangeSet@stripped, 2008-05-05

  mysql-test/suite/funcs_1/r/falcon_views.result@stripped, 2008-05-05 21:21:19+02:00, mleich@stripped +3 -0
    Updated result

diff -Nrup a/mysql-test/suite/funcs_1/r/falcon_views.result b/mysql-test/suite/funcs_1/r/falcon_views.result
--- a/mysql-test/suite/funcs_1/r/falcon_views.result	2008-04-02 14:25:54 +02:00
+++ b/mysql-test/suite/funcs_1/r/falcon_views.result	2008-05-05 21:21:19 +02:00
@@ -22496,6 +22496,9 @@ f1	f2	f4	report
 2	NULL	<-- 10 -->	t1 2
 2	NULL	<-- 10 -->	v1 2
 ALTER TABLE t1 CHANGE COLUMN f4 f4 CHAR(8);
+Warnings:
+Warning	1265	Data truncated for column 'f4' at row <some number>
+Warning	1265	Data truncated for column 'f4' at row <some number>
 INSERT INTO t1 SET f1 = 3, f4 = '<-- 10 -->', report = 't1 3';
 Warnings:
 Warning	1265	Data truncated for column 'f4' at row 1