Merge neptunus.(none):/home/msvensson/mysql/tmp_merge

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Null merge backported changes
mysql-test/lib/mtr_cases.pl:
  Null merge backported changes
mysql-test/lib/mtr_match.pl:
  Auto merged
mysql-test/lib/mtr_misc.pl:
  Null merge backported changes
mysql-test/r/ctype_ucs.result:
  SCCS merged
mysql-test/t/ctype_ucs.test:
  Null merge, fixed in 5.0 already
BUILD/SETUP.sh:
  Merge
mysql-test/r/myisam.result:
  Merge
mysql-test/t/myisam.test:
  Merge
support-files/mysql.spec.sh:
  Merge
tests/mysql_client_test.c:
  Merge
This commit is contained in:
unknown 2006-09-12 11:23:07 +02:00
commit 2214e282a3

Diff Content Not Available