• unknown's avatar
    Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new · 883b2229
    unknown authored
    into  mysql.com:/users/lthalmann/bk/mysql-5.1-new-rpl
    
    
    sql/sql_class.h:
      Auto merged
    sql/sql_table.cc:
      Auto merged
    mysql-test/r/innodb_mysql.result:
      Manual merge
    mysql-test/t/innodb_mysql.test:
      Manual merge
    sql/log.cc:
      Manual merge
    sql/set_var.cc:
      Manual merge
    sql/sql_base.cc:
      Manual merge
    sql/sql_class.cc:
      Manual merge
    sql/sql_parse.cc:
      Manual merge
    883b2229
innodb_mysql.result 1.87 KB