unknown ab64e9b3df Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 ...

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp-security.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/rpl_openssl.test:
  Auto merged
mysql-test/t/sp-security.test:
  Auto merged
sql/sql_parse.cc:
  Auto merged
mysql-test/r/rpl_openssl.result:
  Merge
mysql-test/r/trigger.result:
  Merge
mysql-test/t/trigger.test:
  Merge

2006-04-26 17:00:58 +02:00

1.9 KiB

Raw Blame History

View Raw