• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · 557606e5
    unknown authored
    into  bodhi.local:/opt/local/work/mysql-5.1-runtime
    
    
    mysql-test/r/log_tables.result:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    mysql-test/r/read_only.result:
      Manual merge.
    mysql-test/t/read_only.test:
      Manual merge.
    server-tools/instance-manager/guardian.cc:
      Manual merge.
    557606e5
handler.cc 110 KB