unknown 5d8f7471af Merge mysql.com:/home/dlenev/mysql-5.0-bg11081 ...

into  mysql.com:/home/dlenev/mysql-5.1-merges


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 23:16:53 +04:00

..

mysys_ia64.dsp

merged

2005-09-21 13:53:22 +02:00

mysys.dsp

merged

2005-09-21 13:53:22 +02:00

mysys.dsw

LOAD DATA INFILE is not replicated if replicate_*_table is set

2003-02-28 22:24:00 +02:00

mysys.vcproj

Merge mysql.com:/home/dlenev/mysql-5.0-bg11081

2006-05-02 23:16:53 +04:00