diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-16 14:10:07 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-16 14:10:07 +0500 |
| commit | 5db33c4ecc12f1980acafeb1d64f6175aaed1bff (patch) | |
| tree | b00f1e2b41e0adf4cdc3bc27d973709028d87f63 /libmysql/libmysql.c | |
| parent | d5d1ae03863ae10e20ee1ac29105e83228dd5ae5 (diff) | |
| parent | 1c0be008400f4c0b1996623cffc82e67afb760cc (diff) | |
| download | mariadb-git-5db33c4ecc12f1980acafeb1d64f6175aaed1bff.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
Diffstat (limited to 'libmysql/libmysql.c')
0 files changed, 0 insertions, 0 deletions