mysql-test/r/create.result:
Auto merged
mysql-test/r/isam.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
include/mysqld_error.h:
Resolve merge colflict by changing the warning codes
Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )
scripts/make_win_src_distribution.sh:
Fix for bdb/cxx as they contain .cpp files directly ( for 4.0 to go )
Remove ctype_latin1_de.c from respective dsp files
Fix to make_win_src_distribution.sh to delete all newly added IS Bitkeeper files
VC++Files/libmysql/libmysql.dsp:
Fix the broken file
-- To take care of .zip and .tar
-- Initialization of 'data' directory without any host dependancy data
-- Incorporate all changes from Monty
scripts/make_win_src_distribution.sh:
Fix to take care of .zip and initialization of 'data' directory
scripts/mysql_install_db.sh:
Changes for Windows related though 'WINDOWS' flag