• unknown's avatar
    Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1 · 129300f1
    unknown authored
    into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
    
    
    client/mysqltest.c:
      Auto merged
    myisam/myisamchk.c:
      Auto merged
    mysql-test/t/func_group.test:
      Auto merged
    mysql-test/t/loaddata.test:
      Auto merged
    mysql-test/t/type_decimal.test:
      Auto merged
    mysql-test/t/union.test:
      Auto merged
    sql/item_sum.cc:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    mysql-test/r/func_group.result:
      Manual merge
    mysql-test/r/loaddata.result:
      Manual merge
    mysql-test/r/type_decimal.result:
      Manual merge
    mysql-test/r/union.result:
      Manual merge
    sql/field_conv.cc:
      aborting fix for 7589
    sql/opt_sum.cc:
      Manual merge
    sql/sql_load.cc:
      Manual merge
    sql/sql_yacc.yy:
      Aborting fix for 11553
    129300f1
loaddata.result 4.43 KB