• unknown's avatar
    Merge kaamos.(none):/data/src/opt/mysql-5.0-opt · 153771ed
    unknown authored
    into  kaamos.(none):/data/src/opt/mysql-5.1-opt
    
    
    mysql-test/r/group_by.result:
      Auto merged
    mysql-test/r/type_decimal.result:
      Auto merged
    mysql-test/r/view.result:
      Auto merged
    mysql-test/t/type_decimal.test:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    mysql-test/r/subselect.result:
      Manual merge.
    mysql-test/t/group_by.test:
      Manual merge.
    mysql-test/t/subselect.test:
      Manual merge.
    mysql-test/t/view.test:
      Manual merge.
    153771ed
subselect.result 154 KB