• unknown's avatar
    Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rpl · ecc3a619
    unknown authored
    into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge
    
    
    client/mysqlbinlog.cc:
      Auto merged
    client/mysqldump.c:
      Auto merged
    include/my_pthread.h:
      Auto merged
    mysql-test/t/disabled.def:
      Auto merged
    mysys/my_thr_init.c:
      Auto merged
    sql/item_timefunc.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/log_event.h:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/set_var.cc:
      Auto merged
    sql/set_var.h:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_locale.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    ecc3a619
mysql_priv.h 64.7 KB