Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0

into  hundin.mysql.fi:/home/jan/new/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
This commit is contained in:
unknown 2005-09-05 08:35:58 +03:00
commit 4773490d87
3 changed files with 304 additions and 1 deletions

View file

@ -312,6 +312,7 @@ emacs.h
extra/charset2html
extra/comp_err
extra/created_include_files
extra/innochecksum
extra/my_print_defaults
extra/mysql_install
extra/mysql_tzinfo_to_sql