diff options
author | unknown <monty@mysql.com> | 2004-08-26 18:27:33 +0300 |
---|---|---|
committer | unknown <monty@mysql.com> | 2004-08-26 18:27:33 +0300 |
commit | fa4bafa4d5ea05d874b151924a80ba693b93bb9c (patch) | |
tree | f50012bc1acc5d741fe45620f11da82773be8227 /mysql-test/r/ndb_basic.result | |
parent | e817a9c6c8b93d470a6ee546f60c598310b31673 (diff) | |
parent | f78bbc8c77fa6ce325d965c4b769eed96879747b (diff) | |
download | mariadb-git-fa4bafa4d5ea05d874b151924a80ba693b93bb9c.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
libmysql/libmysql.c:
Auto merged
mysql-test/r/endspace.result:
Auto merged
strings/ctype-bin.c:
Auto merged
strings/ctype-mb.c:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_basic.result')
0 files changed, 0 insertions, 0 deletions