• unknown's avatar
    Merge bk-internal.mysql.com:/home/bk/mysql-5.1 · fee803af
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.1-runtime
    
    
    mysql-test/r/information_schema.result:
      Auto merged
    sql/CMakeLists.txt:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/events.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    mysql-test/t/events_microsec.test:
      SCCS merged
    fee803af
events_microsec.test 748 Bytes