• unknown's avatar
    Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint · be1fb160
    unknown authored
    into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
    
    
    BitKeeper/etc/ignore:
      auto-union
    mysql-test/mysql-test-run.pl:
      Auto merged
    netware/Makefile.am:
      Auto merged
    scripts/make_binary_distribution.sh:
      Auto merged
    sql/mysql_priv.h:
      Auto merged
    tests/Makefile.am:
      Auto merged
    mysql-test/install_test_db.sh:
      Manual merge
    sql/sql_acl.h:
      Manual merge
    be1fb160
sql_acl.h 10.2 KB