• unknown's avatar
    Merge mysql.com:/home/bar/mysql-5.0.b25815 · 82d66603
    unknown authored
    into  mysql.com:/home/bar/mysql-5.1.b25815
    
    
    sql/field.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    mysql-test/extra/binlog_tests/ctype_cp932.test:
      Auto merged
    mysql-test/r/binlog_stm_ctype_cp932.result:
      Auto merged
    sql/mysqld.cc:
      After merge fix
    82d66603
mysqld.cc 295 KB