diff options
author | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-14 16:35:20 +0500 |
---|---|---|
committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-06-14 16:35:20 +0500 |
commit | fec318f4253a9c6eaad6574cbb91dba1617a5db3 (patch) | |
tree | eb0a6d3ab2139653b88ab2a0f4a0d70e79a24f63 /mysql-test/r/ndb_default_cluster.require | |
parent | dc50079b17ecd0db95e1bde91a1cf3e5c6a600e4 (diff) | |
parent | 16d456035058ccc1227940dbd1057d7566e16567 (diff) | |
download | mariadb-git-fec318f4253a9c6eaad6574cbb91dba1617a5db3.tar.gz |
Merge mysql.com:/d2/hf/mrg/mysql-5.0-opt
into mysql.com:/d2/hf/mrg/mysql-5.1-opt
mysql-test/r/type_decimal.result:
Auto merged
sql/item_func.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/ndb_default_cluster.require')
0 files changed, 0 insertions, 0 deletions