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

into  zippy.(none):/home/cmiller/work/mysql/mysql-5.1-new__bug18078


BitKeeper/etc/config:
  Auto merged
VC++Files/mysql.sln:
  Auto merged
VC++Files/mysys/mysys.vcproj:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/timezone2.result:
  Auto merged
mysql-test/t/ps.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/tztime.cc:
  Auto merged
sql/tztime.h:
  Auto merged
tests/Makefile.am:
  Auto merged
tests/mysql_client_test.c:
  Auto merged

2006-05-02 18:41:42 -04:00

31 KiB

Raw Blame History

View Raw