diff options
| author | unknown <bar@mysql.com> | 2005-05-06 12:00:25 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-05-06 12:00:25 +0500 |
| commit | e5950cb1539b43dd5446ef95bd8734cca098eb14 (patch) | |
| tree | a2615fd36dd3e274f33a150f59f6e0e847597e5d /BitKeeper | |
| parent | 930644731d2689929e2372110536c4fbc7330a60 (diff) | |
| parent | 972c1573d1fade4a9ad4e0a853c8551e61a1d637 (diff) | |
| download | mariadb-git-e5950cb1539b43dd5446ef95bd8734cca098eb14.tar.gz | |
merging cp932 from 4.1
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/deleted/.del-have_cp932.inc:
Delete: mysql-test/include/have_cp932.inc
BitKeeper/deleted/.del-ctype_cp932.result:
Delete: mysql-test/r/ctype_cp932.result
BitKeeper/deleted/.del-have_cp932.require:
Delete: mysql-test/r/have_cp932.require
BitKeeper/deleted/.del-ctype_cp932.test:
Delete: mysql-test/t/ctype_cp932.test
BitKeeper/deleted/.del-ctype-cp932.c:
Delete: strings/ctype-cp932.c
include/m_ctype.h:
Auto merged
mysys/charset-def.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'BitKeeper')
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index e1b7579a4f8..35165f820fb 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -243,6 +243,7 @@ serg@serg.mysql.com serg@sergbook.mylan serg@sergbook.mysql.com sergefp@mysql.com +shuichi@mysql.com sinisa@rhols221.adsl.netsonic.fi stewart@mysql.com svoj@mysql.com |