bk commit into 5.0 tree (bar:1.2234)

[bar]

Below is the list of changes that have just been committed into a local
5.0 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@stripped, 2006-09-11 13:56:09+05:00, bar@stripped +2 -0
  Merge abarkov@stripped:/home/bk/mysql-5.0-kt
  into  mysql.com:/usr/home/bar/mysql-5.0-kt
  MERGE: 1.2229.1.34

  mysql-test/r/ctype_utf8.result@stripped, 2006-09-11 13:56:04+05:00, bar@stripped +0 -0
    Auto merged
    MERGE: 1.93.1.4

  mysql-test/t/ctype_utf8.test@stripped, 2006-09-11 13:56:04+05:00, bar@stripped +0 -0
    Auto merged
    MERGE: 1.86.1.4

# 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-5.0-kt/RESYNC

--- 1.95/mysql-test/r/ctype_utf8.result	2006-09-11 13:56:20 +05:00
+++ 1.96/mysql-test/r/ctype_utf8.result	2006-09-11 13:56:20 +05:00
@@ -1340,6 +1340,19 @@
 a
 e
 drop table t1;
+set names utf8;
+grant select on test.* to юзер_юзер@localhost;
+user()
+юзер_юзер@localhost
+revoke all on test.* from юзер_юзер@localhost;
+drop user юзер_юзер@localhost;
+create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+select database();
+database()
+имя_базы_в_кодировке_утф8_длиной_больше_чем_45
+drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+use test;
 CREATE TABLE t1(id varchar(20) NOT NULL) DEFAULT CHARSET=utf8;
 INSERT INTO t1 VALUES ('xxx'), ('aa'), ('yyy'), ('aa');
 SELECT id FROM t1;

--- 1.88/mysql-test/t/ctype_utf8.test	2006-09-11 13:56:20 +05:00
+++ 1.89/mysql-test/t/ctype_utf8.test	2006-09-11 13:56:20 +05:00
@@ -1069,6 +1069,23 @@
 select a from t1 group by a;
 drop table t1;
 
+#
+# Bug#20393: User name truncation in mysql client
+# Bug#21432: Database/Table name limited to 64 bytes, not chars, problems with multi-byte
+#
+set names utf8;
+#create user юзер_юзер@localhost;
+grant select on test.* to юзер_юзер@localhost;
+--exec $MYSQL --default-character-set=utf8 --user=юзер_юзер -e "select user()"
+revoke all on test.* from юзер_юзер@localhost;
+drop user юзер_юзер@localhost;
+
+create database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+use имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+select database();
+drop database имя_базы_в_кодировке_утф8_длиной_больше_чем_45;
+use test;
+
 # End of 4.1 tests
 
 #