• unknown's avatar
    Merge mysql.com:/home/hf/work/mrg/mysql-5.0-opt · 2c5395ee
    unknown authored
    into  mysql.com:/home/hf/work/mrg/mysql-5.1-opt
    
    
    mysql-test/r/insert_select.result:
      Auto merged
    mysql-test/t/insert_select.test:
      Auto merged
    sql/field.h:
      Auto merged
    sql/item.cc:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/sql_select.h:
      Auto merged
    mysql-test/r/create.result:
      merging
    mysql-test/r/temp_table.result:
      SCCS merged
    mysql-test/r/type_float.result:
      merging
    mysql-test/r/union.result:
      merging
    mysql-test/t/temp_table.test:
      merging
    2c5395ee
insert_select.result 11.6 KB