unknown a160bc9cce Merge bk-internal.mysql.com:/home/bk/mysql-5.0 ...

into  mysql.com:/home/dlenev/src/mysql-5.0-tn


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/share/errmsg.txt:
  Manual merge.

2005-07-19 20:55:09 +04:00

19 KiB

Raw Blame History

View Raw