bk commit into 5.0 tree (dlenev:1.2085)

[dlenev]

Below is the list of changes that have just been committed into a local
5.0 repository of dlenev. When dlenev 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
  1.2085 06/02/27 17:51:21 dlenev@stripped +1 -0
  Fixed test results after bad auto-merge.

  mysql-test/r/ps.result
    1.61 06/02/27 17:51:11 dlenev@stripped +14 -0
    Fixed test results after bad auto-merge.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	dlenev
# Host:	brandersnatch.site
# Root:	/home/dlenev/src/mysql-5.0-bg13525

--- 1.60/mysql-test/r/ps.result	2006-02-24 00:00:01 +03:00
+++ 1.61/mysql-test/r/ps.result	2006-02-27 17:51:11 +03:00
@@ -859,6 +859,20 @@
 5
 deallocate prepare stmt;
 drop table t1;
+prepare stmt from 'create table t1 (a varchar(10) character set utf8)';
+execute stmt;
+insert into t1 (a) values (repeat('a', 20));
+select length(a) from t1;
+length(a)
+10
+drop table t1;
+execute stmt;
+insert into t1 (a) values (repeat('a', 20));
+select length(a) from t1;
+length(a)
+10
+drop table t1;
+deallocate prepare stmt;
 create table t1 (id int);
 prepare ins_call from "insert into t1 (id) values (1)";
 execute ins_call;