• unknown's avatar
    Merge mysqldev@production.mysql.com:my/mysql-5.0-release · c4eee8bd
    unknown authored
    into  mysql.com:/opt/local/work/mysql-5.0-root
    
    
    BitKeeper/etc/ignore:
      auto-union
    include/my_sys.h:
      Auto merged
    mysql-test/r/information_schema.result:
      Auto merged
    mysql-test/t/ctype_ujis.test:
      Auto merged
    sql/ha_federated.cc:
      Auto merged
    sql/handler.cc:
      Auto merged
    sql/item_func.h:
      Auto merged
    sql/log.cc:
      Auto merged
    sql/sp_head.cc:
      Auto merged
    sql/sp_head.h:
      Auto merged
    sql/sql_acl.cc:
      Auto merged
    sql/sql_base.cc:
      Auto merged
    sql/sql_class.cc:
      Auto merged
    sql/sql_class.h:
      Auto merged
    sql/sql_lex.h:
      Auto merged
    sql/sql_prepare.cc:
      Auto merged
    sql/sql_select.cc:
      Auto merged
    sql/sql_view.cc:
      Auto merged
    sql/table.cc:
      Auto merged
    c4eee8bd
.bzrignore 25.9 KB