• unknown's avatar
    Merge mhansson@bk-internal:/home/bk/mysql-5.0-opt · 30b17b99
    unknown authored
    into  linux-st28.site:/home/martin/mysql/src/bug32858/my50-bug32858-push
    
    
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    mysql-test/r/union.result:
      Bug#32858: Manual merge
    mysql-test/t/union.test:
      Bug#32858: Manual merge
    30b17b99
union.test 33.7 KB