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

into  bodhi.(none):/opt/local/work/mysql-5.0-runtime


mysql-test/t/sp.test:
  Auto merged
sql/item.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Manual merge.
mysql-test/t/innodb_mysql.test:
  Manual merge.

2007-07-16 23:41:28 +04:00

366 B

Raw Blame History

View Raw