• unknown's avatar
    Merge stella.local:/home2/mydev/mysql-5.0-amain · 0d6f9bad
    unknown authored
    into  stella.local:/home2/mydev/mysql-5.0-axmrg
    
    
    mysql-test/r/ctype_big5.result:
      Auto merged
    mysql-test/r/ctype_cp932.result:
      Auto merged
    mysql-test/r/ctype_euckr.result:
      Auto merged
    mysql-test/r/ctype_gb2312.result:
      Auto merged
    mysql-test/r/ctype_gbk.result:
      Auto merged
    mysql-test/r/ctype_uca.result:
      Auto merged
    mysql-test/r/ctype_ucs.result:
      Auto merged
    mysql-test/t/ctype_ucs.test:
      Auto merged
    sql/slave.cc:
      Auto merged
    0d6f9bad
slave.cc 175 KB