Commit f66cb702 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kostja/mysql/tmp_merge 

into  mysql.com:/home/kostja/mysql/mysql-5.1-merge


mysql-test/r/innodb.result:
  SCCS merged
mysql-test/t/innodb.test:
  SCCS merged
storage/innobase/dict/dict0dict.c:
  SCCS merged
parents 2f370575 e6d7f242

There are no changes