unknown 5a78cd7a72 Merge mysql.com:/extern/mysql/5.0/bug17476/mysql-5.0 ...

into  mysql.com:/extern/mysql/5.1/generic/mysql-5.1-new


mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/grant2.result:
  Auto merged
mysql-test/r/sp.result:
  Auto merged
mysql-test/t/grant2.test:
  Auto merged
mysql-test/t/skip_grants.test:
  Auto merged
mysql-test/t/sp.test:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field_conv.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/sql_udf.cc:
  Auto merged
VC++Files/mysql.sln:
  Manual merge (use local).
configure.in:
  Manual merge.
sql/table.cc:
  Manual merge.

2006-03-03 12:03:27 +01:00

..

old

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

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

gen_lex_hash.dsp

project files update for win32 build

2006-02-27 16:30:14 +03:00

gen_lex_hash.vcproj

project files update for win32 build

2006-02-27 16:30:14 +03:00

message.mc

Adding the file needed for windows build (on behalf of Reggie)

2004-08-27 03:27:16 +04:00

mysqld_ia64.dsp

File / directory structure change from 5.0 to 5.1:

2005-07-22 18:45:31 +02:00

mysqld.dsp

Cleanup "make dist" and Windows builds after push of pluggable storage engines.

2005-12-22 13:18:06 +01:00

mysqld.dsw

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

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

mysqld.vcproj

Windows compile fixes.

2006-02-28 13:21:35 +01:00

mysqldmax_ia64.dsp

Various fixes for Windows 2003 Platform SDK SP1 beta

2005-03-07 13:04:05 +01:00

mysqldmax.dsp

prepare, winmysqladmin.cpp, mysqldmax.dsp, mysqld.dsp, mysql.dsw:

2005-01-01 20:27:51 +01:00