diff options
author | unknown <bar@mysql.com> | 2006-03-28 17:07:26 +0500 |
---|---|---|
committer | unknown <bar@mysql.com> | 2006-03-28 17:07:26 +0500 |
commit | 20f9897209cbdd0f9309237b30882aefddbccb91 (patch) | |
tree | cb6386e1dc7095e7231e33e66f1b6cfb993dd3ea /mysql-test/r/grant_cache.result | |
parent | 3c1b3b242c4a6635bd1ff9338f89fba28accd7c4 (diff) | |
parent | f786bcbcbe1fe92da06b640030b3cc6c504a8d3c (diff) | |
download | mariadb-git-20f9897209cbdd0f9309237b30882aefddbccb91.tar.gz |
Merge mysql.com:/usr/home/bar/mysql-4.1.b15098
into mysql.com:/usr/home/bar/mysql-5.0
Bug#15098
mysql-test/t/cast.test:
Auto merged
mysql-test/r/cast.result:
After merge fix
sql/field.cc:
After merge fix
Diffstat (limited to 'mysql-test/r/grant_cache.result')
0 files changed, 0 insertions, 0 deletions