unknown 84ddd543c7 Merge bk-internal.mysql.com:/home/bk/mysql-4.1 ...

into  mysql.com:/home/dlenev/src/mysql-4.1-bg12423


sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/grant2.result:
  Manual merge.
mysql-test/t/grant2.test:
  Manual merge.

2005-09-01 17:01:25 +04:00

112 KiB

Raw Blame History

View Raw