diff options
author | unknown <stewart@willster.(none)> | 2007-01-24 16:16:16 +1100 |
---|---|---|
committer | unknown <stewart@willster.(none)> | 2007-01-24 16:16:16 +1100 |
commit | 1b71102f4bc56181e7781e0367bb6f44876a4553 (patch) | |
tree | c884b46b619662b6cb8e7421d98a077454f5c4af /mysql-test/r/udf.result | |
parent | f80084bff9c180404ea13a674d20b854e6a73042 (diff) | |
parent | 71f606804cf50ac23bea44408ea4faf71867ee2c (diff) | |
download | mariadb-git-1b71102f4bc56181e7781e0367bb6f44876a4553.tar.gz |
Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-work
into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work
storage/ndb/src/common/util/SocketClient.cpp:
Auto merged
Diffstat (limited to 'mysql-test/r/udf.result')
0 files changed, 0 insertions, 0 deletions