diff options
author | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:08:21 -0600 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2001-08-11 17:08:21 -0600 |
commit | d7c5327db62886135dcb14ba1d9d117eaeaf6100 (patch) | |
tree | 52622ae9741cd2f7d41b4acdd139ece525f58430 /mysql-test/r/innodb.result | |
parent | 7a4b7c4fdac6143bf75344419eee740a8b5c9fd4 (diff) | |
parent | 46aeed09570d266aa2666008ebde3cf168905164 (diff) | |
download | mariadb-git-d7c5327db62886135dcb14ba1d9d117eaeaf6100.tar.gz |
Merge work:/home/bk/mysql-4.0
into mysql.sashanet.com:/home/sasha/src/bk/mysql-4.0
BitKeeper/etc/logging_ok:
auto-union
libmysql/libmysql.c:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/innodb.result')
0 files changed, 0 insertions, 0 deletions