diff options
| author | unknown <konstantin@mysql.com> | 2005-05-14 12:38:12 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-05-14 12:38:12 +0400 |
| commit | f71917ff53de79c1ab3251d248d602b4dfb82681 (patch) | |
| tree | 301d852032306dc5560a6076b889c4d7c3d6da7d /include/violite.h | |
| parent | 73cc08e81882bbbe6cac4c40f14d7227ef39b2bb (diff) | |
| parent | c8335d6c7ce7a0513435862175f5e1702d32ecac (diff) | |
| download | mariadb-git-f71917ff53de79c1ab3251d248d602b4dfb82681.tar.gz | |
Manual merge (again)
configure.in:
Auto merged
include/mysql.h:
Auto merged
innobase/row/row0mysql.c:
Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
Auto merged
libmysql/libmysql.c:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/r/ctype_ucs.result:
Auto merged
mysql-test/t/ctype_ucs.test:
Auto merged
mysql-test/t/ps_grant.test:
Auto merged
sql/ha_blackhole.cc:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'include/violite.h')
0 files changed, 0 insertions, 0 deletions