diff options
author | unknown <evgen@moonbone.local> | 2006-08-02 18:11:59 +0400 |
---|---|---|
committer | unknown <evgen@moonbone.local> | 2006-08-02 18:11:59 +0400 |
commit | 1cf65f311dbf09615bea443b041a78db34d7e2ea (patch) | |
tree | b50d68ff0aa99e35aaa3234fb821c6790a2cabc1 /mysql-test/r/udf.result | |
parent | a5812433838540b600aac4689c3a44b44ab9d0be (diff) | |
parent | 759027d12641307cd3ec8c0ea907cd6323120987 (diff) | |
download | mariadb-git-1cf65f311dbf09615bea443b041a78db34d7e2ea.tar.gz |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/udf.result')
0 files changed, 0 insertions, 0 deletions