bk commit into 4.1 tree (bar:1.2161)

[bar]

Below is the list of changes that have just been committed into a local
4.1 repository of bar. When bar 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.2161 05/03/30 14:10:27 bar@stripped +3 -0
  Remove .opt file for faster test running.

  mysql-test/t/ctype_cp1251.test
    1.5 05/03/30 14:10:21 bar@stripped +2 -2
    Remove .opt file for faster test running.

  mysql-test/r/ctype_cp1251.result
    1.6 05/03/30 14:10:21 bar@stripped +2 -2
    Remove .opt file for faster test running.

  BitKeeper/deleted/.del-ctype_cp1251-master.opt~68be9a59ec8ee106
    1.3 05/03/30 14:06:42 bar@stripped +0 -0
    Delete: mysql-test/t/ctype_cp1251-master.opt

# 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:	bar
# Host:	bar.intranet.mysql.r18.ru
# Root:	/usr/home/bar/mysql-4.1

--- 1.5/mysql-test/r/ctype_cp1251.result	2005-02-26 18:15:01 +04:00
+++ 1.6/mysql-test/r/ctype_cp1251.result	2005-03-30 14:10:21 +05:00
@@ -1,6 +1,6 @@
 drop table if exists t1;
 SET NAMES cp1251;
-create table t1 (a varchar(10) not null);
+create table t1 (a varchar(10) not null) character set cp1251;
 insert into t1 values ("a"),("ab"),("abc");
 select * from t1;
 a
@@ -23,7 +23,7 @@
 b
 c
 drop table t1;
-create table t1 (a char(15) binary, b binary(15));
+create table t1 (a char(15) binary, b binary(15)) character set cp1251;
 insert into t1 values ('aaa','bbb'),('AAA','BBB');
 select upper(a),upper(b) from t1;
 upper(a)	upper(b)

--- 1.4/mysql-test/t/ctype_cp1251.test	2005-02-26 18:15:01 +04:00
+++ 1.5/mysql-test/t/ctype_cp1251.test	2005-03-30 14:10:21 +05:00
@@ -10,7 +10,7 @@
 # Test problem with LEFT() (Bug #514)
 #
 
-create table t1 (a varchar(10) not null);
+create table t1 (a varchar(10) not null) character set cp1251;
 insert into t1 values ("a"),("ab"),("abc");
 select * from t1;
 select a, left(a,1) as b from t1;
@@ -21,7 +21,7 @@
 #
 # Test of binary and upper/lower
 #
-create table t1 (a char(15) binary, b binary(15));
+create table t1 (a char(15) binary, b binary(15)) character set cp1251;
 insert into t1 values ('aaa','bbb'),('AAA','BBB');
 select upper(a),upper(b) from t1;
 select lower(a),lower(b) from t1;