unknown f3a4f0afff Merge mysql.com:/usr/home/bar/mysql-5.0 ...

into  mysql.com:/usr/home/bar/mysql-5.1-new


mysql-test/r/information_schema.result:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/share/charsets/Index.xml:
  Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  Auto merged

2006-04-05 19:00:02 +05:00

..

charsets

Merge mysql.com:/usr/home/bar/mysql-5.0

2006-04-05 19:00:02 +05:00

.cvsignore

…

errmsg.txt

Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.1-new

2006-03-14 00:51:44 -08:00

Makefile.am

Additional "make distcheck" changes specific to 5.0

2005-11-09 11:56:04 +02:00