• unknown's avatar
    Merge mysql.com:/home/dlenev/src/mysql-4.1-bg12423 · 7783dbbc
    unknown authored
    into  mysql.com:/home/dlenev/src/mysql-5.0-merges
    
    
    mysql-test/lib/mtr_report.pl:
      Auto merged
    mysql-test/lib/mtr_timer.pl:
      Auto merged
    sql/mysqld.cc:
      Auto merged
    sql/sql_acl.h:
      Auto merged
    sql/examples/ha_archive.cc:
      Auto merged
    mysql-test/lib/mtr_process.pl:
      Manual merge.
    mysql-test/mysql-test-run.pl:
      Manual merge.
    mysql-test/r/grant2.result:
      Manual merge.
    mysql-test/t/grant2.test:
      Manual merge.
    sql/sql_acl.cc:
      Manual merge.
    sql/sql_parse.cc:
      Manual merge.
    7783dbbc
grant2.result 14.9 KB