• unknown's avatar
    Merge magare.gmz:/home/kgeorge/mysql/work/B27531-5.0-opt · 27f581a0
    unknown authored
    into  magare.gmz:/home/kgeorge/mysql/work/B27531-5.1-opt
    
    
    mysql-test/r/cast.result:
      Auto merged
    mysql-test/r/join_outer.result:
      Auto merged
    mysql-test/t/cast.test:
      Auto merged
    mysql-test/t/join_outer.test:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/item_subselect.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_select.h:
      Auto merged
    mysql-test/r/subselect.result:
      merge of 5.0-opt -> 5.1-opt
    mysql-test/t/subselect.test:
      merge of 5.0-opt -> 5.1-opt
    27f581a0
item_func.cc 131 KB