diff options
author | unknown <mikael/pappa@dator5.(none)> | 2006-09-27 06:49:25 -0400 |
---|---|---|
committer | unknown <mikael/pappa@dator5.(none)> | 2006-09-27 06:49:25 -0400 |
commit | 51b1ec1f44924d8ac6385d306ee9090575fe2386 (patch) | |
tree | 09d0a3dc67c7bf8fb68eca41ad818b5bd26bb5cf /mysql-test/r/mysqltest.result | |
parent | 5529b7fb959e1d01b3699f0c347bb5e97becdc65 (diff) | |
parent | 288da1d759874293fdfdb06f15194b826d7dadb4 (diff) | |
download | mariadb-git-51b1ec1f44924d8ac6385d306ee9090575fe2386.tar.gz |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug18198
sql/item.h:
Auto merged
Diffstat (limited to 'mysql-test/r/mysqltest.result')
0 files changed, 0 insertions, 0 deletions