• unknown's avatar
    Merge work.mysql.com:/home/bk/mysql · d95ec597
    unknown authored
    into mysql.sashanet.com:/home/sasha/src/bk/mysql
    
    
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/slave.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    d95ec597
mysqld.cc 117 KB