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
VC++Files/mysql.sln:
mysql_client_test depends on mysys.
VC++Files/mysys/mysys.vcproj:
Add new file missing in previous push.
mysys/my_memmem.c:
Fix illegal pointer arithmetics on void *.
tests/Makefile.am:
-L must go before -l
tests/mysql_client_test.c:
No declarations after statement in C code.
into mysql.com:/home/jimw/my/mysql-5.1-clean
BitKeeper/etc/ignore:
auto-union
BitKeeper/deleted/.del-mysql_upgrade.dsp:
Delete: VC++Files/client/mysql_upgrade.dsp
BitKeeper/deleted/.del-mysql_upgrade_ia64.dsp:
Delete: VC++Files/client/mysql_upgrade_ia64.dsp
BitKeeper/deleted/.del-mysql_upgrade.c:
Delete: client/mysql_upgrade.c
VC++Files/mysql.dsw:
Auto merged
VC++Files/mysql.sln:
Auto merged
VC++Files/mysql_ia64.dsw:
Auto merged
client/mysql.cc:
Auto merged
config/ac-macros/zlib.m4:
Auto merged
configure.in:
Auto merged
extra/yassl/Makefile.am:
Auto merged
extra/yassl/taocrypt/Makefile.am:
Auto merged
include/my_global.h:
Auto merged
include/mysql.h:
Auto merged
libmysql/libmysql.def:
Auto merged
libmysqld/libmysqld.def:
Auto merged
mysql-test/r/grant2.result:
Auto merged
mysql-test/r/sp-security.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/udf.result:
Auto merged
mysql-test/t/grant2.test:
Auto merged
mysql-test/t/rpl_openssl.test:
Auto merged
mysql-test/t/rpl_rotate_logs.test:
Auto merged
mysql-test/t/sp-security.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql-common/client.c:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_parse.cc:
Auto merged
client/Makefile.am:
Resolve conflict
config/ac-macros/yassl.m4:
Resolve conflict
mysql-test/include/have_udf.inc:
Resolve conflict
mysql-test/lib/mtr_process.pl:
Resolve conflict
mysql-test/mysql-test-run.pl:
Resolve conflict
mysql-test/r/have_udf.require:
Resolve conflict
mysql-test/r/rpl_openssl.result:
Resolve conflict
mysql-test/t/disabled.def:
Resolve conflict
mysql-test/t/information_schema.test:
Resolve conflict
server-tools/instance-manager/instance_options.cc:
Resolve conflict
sql/mysql_priv.h:
Resolve conflict
sql/set_var.cc:
Resolve conflict
support-files/mysql.spec.sh:
Resolve conflict
VC++Files/mysql.sln:
gen_lex_hash.vcproj is added into mysql.sln for win32 build.
VC++Files/sql/gen_lex_hash.dsp:
gen_lex_hash project file is added for win32 build.
VC++Files/sql/gen_lex_hash.vcproj:
gen_lex_hash project file is added for win32 build.
Visual C++ dont relate 'byte' and 'char*' that close, added casts
mysql.sln:
Only build mysqlserver.lib if embedded target
VC++Files/mysql.sln:
Only build mysqlserver.lib if embedded target
sql/log_event.cc:
Visual C++ dont relate 'byte' and 'char*' that close, added casts
VC++Files/mysql.sln:
mysql.sln updated to include fulltext plugin example.
VC++Files/plugin/fulltext/fulltext.def:
fulltext.def is added to allow exports for fulltext.dll
VC++Files/plugin/fulltext/fulltext.vcproj:
fulltext.vcproj added to enable plugin example test under win32.
VC++Files/client/mysqldump.vcproj:
Add missing source file.
VC++Files/mysql.sln:
Fix configuration mismatch.
VC++Files/sql/mysqld.vcproj:
Enable row-based replication.
Add missing source files.
scripts/make_win_src_distribution.sh:
Add copying of missing directory.
sql/event.h:
Fix type conflict only visible on Windows.
sql/event_executor.cc:
Fix non-portable thread stuff.
sql/event_timed.cc:
Fix type conflict only visible on Windows.
sql/ha_archive.cc:
Add cast needed for Windows.
sql/handler.h:
Fix Windows byte * <-> char * mismatch.
sql/opt_range.cc:
Fix Windows byte * <-> char * mismatch.
sql/set_var.cc:
BUG#16811
Fix Windows compilation by making the cast-away of volatile implicit
(Windows linker does not like volatile <-> non-volatile mismatch, in
contrast to Unix)
sql/sql_partition.cc:
Fix Windows byte * <-> char * mismatch.
VC++Files/client/mysqlslap.vcproj:
Explicit library specification removed from project file
VC++Files/mysql.sln:
Dependency to mysqlclient & mysys is added for mysqlslap in mysql.sln
VC++Files/client/mysqlslap.vcproj:
Added references to mysqlclient.lib & mysys.lib for mysqlslap build on win32.
VC++Files/mysql.sln:
mysqlslap.vcproj is added into mysql.sln
client/mysqlslap.c:
Win32 specific code is added to build & run mysqlslap successfully on win32.
Don't run "mysqlslap" on Windows
mysqlslap.test:
We don't run "mysqlslap" on Windows
mysql.sln:
Removed build of "client/mysqlslap.c" on Windows
VC++Files/mysql.sln:
Removed build of "client/mysqlslap.c" on Windows
mysql-test/t/mysqlslap.test:
We don't run "mysqlslap" on Windows
mysql-test/mysql-test-run.pl:
Don't run "mysqlslap" on Windows
Enable build on Windows
VC++Files/mysql.sln:
Enable build on Windows
VC++Files/libmysqld/libmysqld.vcproj:
Enable build on Windows
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
Enable build on Windows
VC++Files/myisamchk/myisamchk.vcproj:
Enable build on Windows
VC++Files/myisamlog/myisamlog.vcproj:
Enable build on Windows
VC++Files/myisampack/myisampack.vcproj:
Enable build on Windows
VC++Files/mysqldemb/mysqldemb.vcproj:
Enable build on Windows
VC++Files/mysqlserver/mysqlserver.vcproj:
Enable build on Windows
VC++Files/sql/mysqld.vcproj:
Enable build on Windows
VC++Files/storage/bdb/bdb.vcproj:
Enable build on Windows
VC++Files/storage/myisam/myisam.vcproj:
Enable build on Windows
VC++Files/storage/myisammrg/myisammrg.vcproj:
Enable build on Windows
VC++Files/strings/strings.vcproj:
Enable build on Windows
updated include directory after move to storage directory
mysql.sln:
updated locations of storage engines
myisam.vcproj:
Rename: VC++Files/myisam/myisam.vcproj -> VC++Files/storage/myisam/myisam.vcproj
heap.vcproj:
Rename: VC++Files/heap/heap.vcproj -> VC++Files/storage/heap/heap.vcproj
innobase.vcproj:
Rename: VC++Files/innobase/innobase.vcproj -> VC++Files/storage/innobase/innobase.vcproj
myisammrg.vcproj:
Rename: VC++Files/myisammrg/myisammrg.vcproj -> VC++Files/storage/myisammrg/myisammrg.vcproj
bdb.vcproj:
Rename: VC++Files/bdb/bdb.vcproj -> VC++Files/storage/bdb/bdb.vcproj
VC++Files/mysql.sln:
updated locations of storage engines
VC++Files/storage/bdb/bdb.vcproj:
updated include directory after move to storage directory
VC++Files/storage/heap/heap.vcproj:
updated include directory after move to storage directory
VC++Files/storage/innobase/innobase.vcproj:
updated include directory after move to storage directory
VC++Files/storage/myisam/myisam.vcproj:
updated include directory after move to storage directory
VC++Files/storage/myisammrg/myisammrg.vcproj:
updated include directory after move to storage directory
Removed Debug target not used
mysql.sln:
Added pro-gpl target
Build mysqlwatch and mysqlshutdown for classic as well
VC++Files/mysql.sln:
Added pro-gpl target
VC++Files/mysqlwatch/mysqlwatch.vcproj:
Removed Debug target not used
Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/client/mysqlclient.vcproj:
Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/libmysql/libmysql.vcproj:
Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/libmysqld/libmysqld.vcproj:
Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/mysql.sln:
Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/mysys/mysys.vcproj:
Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/sql/mysqld.vcproj:
Revert back 5.0 changes to Visual Studio .Net project files
VC++Files/strings/strings.vcproj:
Revert back 5.0 changes to Visual Studio .Net project files
New VC7 project files
des_key_file.cc:
Visual C++ wants '"' for local include
mysql.cc:
Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
VC++Files/mysqlserver/dummy.cpp:
Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
New VC7 project files
VC++Files/client/mysql.vcproj:
New VC7 project files
VC++Files/client/mysqladmin.vcproj:
New VC7 project files
VC++Files/client/mysqlclient.vcproj:
New VC7 project files
VC++Files/client/mysqldump.vcproj:
New VC7 project files
VC++Files/client/mysqlimport.vcproj:
New VC7 project files
VC++Files/client/mysqlshow.vcproj:
New VC7 project files
VC++Files/client/mysqltest.vcproj:
New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
New VC7 project files
VC++Files/dbug/dbug.vcproj:
New VC7 project files
VC++Files/heap/heap.vcproj:
New VC7 project files
VC++Files/innobase/innobase.vcproj:
New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
New VC7 project files
VC++Files/myisam/myisam.vcproj:
New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
New VC7 project files
VC++Files/mysql.sln:
New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
New VC7 project files
VC++Files/mysys/mysys.vcproj:
New VC7 project files
VC++Files/perror/perror.vcproj:
New VC7 project files
VC++Files/regex/regex.vcproj:
New VC7 project files
VC++Files/replace/replace.vcproj:
New VC7 project files
VC++Files/sql/mysqld.vcproj:
New VC7 project files
VC++Files/strings/strings.vcproj:
New VC7 project files
VC++Files/test1/test1.vcproj:
New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
New VC7 project files
VC++Files/vio/vio.vcproj:
New VC7 project files
VC++Files/zlib/zlib.vcproj:
New VC7 project files
client/mysql.cc:
Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
New VC7 project files
