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

into  mysql.com:/opt/local/work/mysql-4.1-16365


sql/mysql_priv.h:
  Auto merged
sql/sql_class.h:
  Auto merged
mysql-test/r/ps.result:
  Manual merge
mysql-test/t/ps.test:
  Manual merge

2006-04-07 23:50:45 +04:00

26 KiB

Raw Blame History

View Raw