• unknown's avatar
    Merge mysql.com:/home/jimw/my/mysql-4.1-clean · d9d1337e
    unknown authored
    into  mysql.com:/home/jimw/my/mysql-5.0-clean
    
    
    mysql-test/r/union.result:
      Auto merged
    sql/item.cc:
      Auto merged
    vio/viosslfactories.c:
      Auto merged
    mysql-test/t/union.test:
      Resolve conflict
    d9d1337e
union.result 36.3 KB