• unknown's avatar
    Merge stella.local:/home2/mydev/mysql-5.1-amain · 1603139d
    unknown authored
    into  stella.local:/home2/mydev/mysql-5.1-axmrg
    
    
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/t/ctype_ucs.test:
      Auto merged
    mysql-test/t/variables.test:
      Auto merged
    sql/ha_partition.cc:
      Auto merged
    sql/item_func.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/table.cc:
      Auto merged
    1603139d
variables.test 26.4 KB