diff options
| author | unknown <bar@mysql.com> | 2005-10-14 12:07:13 +0500 |
|---|---|---|
| committer | unknown <bar@mysql.com> | 2005-10-14 12:07:13 +0500 |
| commit | df3e57f51fe567e5ba08054a4a22e466eb742289 (patch) | |
| tree | e54374ff1c9d434cfd400947fa2b7cd3714d86ac /strings | |
| parent | 7ec9653938aab3e4cf480d69694bbb7f78557e08 (diff) | |
| parent | 9cc7d75ea3acf8cf2f2491e8740d48f83cf0c47b (diff) | |
| download | mariadb-git-df3e57f51fe567e5ba08054a4a22e466eb742289.tar.gz | |
Merge mysql.com:/usr/home/bar/mysql-4.1.b13751
into mysql.com:/usr/home/bar/mysql-5.0.char1
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_func.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
after merge fix.
sql/sql_update.cc:
discarding this change in 5.0.
Diffstat (limited to 'strings')
0 files changed, 0 insertions, 0 deletions