• unknown's avatar
    Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new-rpl · c441c64e
    unknown authored
    into  mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
    
    
    BitKeeper/etc/ignore:
      auto-union
    Makefile.am:
      Auto merged
    client/mysqldump.c:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/t/disabled.def:
      Auto merged
    sql/CMakeLists.txt:
      Auto merged
    sql/Makefile.am:
      Auto merged
    sql/ha_ndbcluster.cc:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/log_event.cc:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_insert.cc:
      Auto merged
    sql/sql_parse.cc:
      Auto merged
    sql/sql_show.cc:
      Auto merged
    sql/sql_yacc.yy:
      Auto merged
    sql/table.h:
      Auto merged
    storage/innobase/handler/ha_innodb.cc:
      Auto merged
    mysql-test/r/mysqldump.result:
      Restoring rpl tree mysqldump test file to main tree test files
    mysql-test/r/status.result:
      Manual merge
    mysql-test/t/mysqldump.test:
      Restoring rpl tree mysqldump test file to main tree test files
    c441c64e
mysql_priv.h 77.9 KB