diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2008-04-01 12:38:24 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2008-04-01 12:38:24 -0400 |
| commit | 3ff75e24e21a3e5af61e4e255412b0df9f2d4e1d (patch) | |
| tree | 5183d59a343bde1ac1ada477245436ea92e30b26 | |
| parent | 9efddcf6e2facc7ed21e755785c3cec9f76f71b2 (diff) | |
| parent | a9e658408fd40ed9485654539b334b92272361c0 (diff) | |
| download | mariadb-git-3ff75e24e21a3e5af61e4e255412b0df9f2d4e1d.tar.gz | |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
mysql-test/t/type_blob.test:
Auto merged
sql/field.cc:
Auto merged
sql/unireg.h:
Auto merged
0 files changed, 0 insertions, 0 deletions