diff options
author | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-08-16 09:31:24 +0500 |
---|---|---|
committer | unknown <bar@mysql.com/bar.intranet.mysql.r18.ru> | 2006-08-16 09:31:24 +0500 |
commit | c55b9f50696e3e1768f52f78b3d62f48062319f4 (patch) | |
tree | 0f3dd6cdc643197c55d16511b3b8c6d738ccf4d5 /mysql-test/suite | |
parent | 73c1453e35219fb1b75fb760f438bdbcb3bc1888 (diff) | |
parent | 9328e8874ac3eb2351ad2a283482efd097c8515e (diff) | |
download | mariadb-git-c55b9f50696e3e1768f52f78b3d62f48062319f4.tar.gz |
Merge mysql.com:/usr/home/bar/mysql-4.1
into mysql.com:/usr/home/bar/mysql-4.1.b9509
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/suite')
0 files changed, 0 insertions, 0 deletions