• unknown's avatar
    Merge mysql.com:/home/bar/mysql-5.0.merge · 783634d6
    unknown authored
    into  mysql.com:/home/bar/mysql-5.1-rpl
    
    
    mysql-test/r/mysqlbinlog.result:
      Auto merged
    mysql-test/t/mysqlbinlog.test:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_load.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    783634d6
sql_class.h 70.4 KB