diff options
author | unknown <joerg@trift2.> | 2007-06-14 21:25:10 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2007-06-14 21:25:10 +0200 |
commit | d0d6c42cc9c32451119f9e6cbb8ba4399ffc206b (patch) | |
tree | 0535c696e42a1777563a2462cb3d938abf0c0d63 /mysql-test/t/sp-code.test | |
parent | 6f5a6162687744aefdde6a550a38f5aaa0dc2318 (diff) | |
parent | bcd6183fe7f242648ce6e04c8224c98531f1cbff (diff) | |
download | mariadb-git-d0d6c42cc9c32451119f9e6cbb8ba4399ffc206b.tar.gz |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
sql/item_func.cc:
Manual merge: thread identity check was gone from this place in main 5.0.
Diffstat (limited to 'mysql-test/t/sp-code.test')
0 files changed, 0 insertions, 0 deletions