into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
VC++Files/sql/mysqld.vcproj:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/warnings-master.opt:
Auto merged
mysql-test/t/warnings.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
into trift2.:/M50/merge-4.1-to-5.0
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/libmysqld/libmysqld_ia64.dsp:
Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
Auto merged
VC++Files/sql/mysqld.dsp:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
VC++Files/sql/mysqld_ia64.dsp:
Auto merged
VC++Files/sql/mysqldmax.dsp:
Auto merged
sql/field.cc:
Merge a backport == Null-merge == "ul".
sql/field.h:
Merge a backport == Null-merge == "ul".
sql/sql_locale.cc:
Changes were already present (and even better) == Null-merge == "ul".
Place mysqlmanager 'pdb' file in 'client_debug' directory
mysys.vcproj:
Removed define of __NT__ from 'Debug' target
mysqld.vcproj:
Always generate 'pdb' and 'map' files
server-tools/instance-manager/mysqlmanager.vcproj:
Place mysqlmanager 'pdb' file in 'client_debug' directory
VC++Files/mysys/mysys.vcproj:
Removed define of __NT__ from 'Debug' target
VC++Files/sql/mysqld.vcproj:
Always generate 'pdb' and 'map' files
1) When initializing a boolean variable, do not use string representations '"false"' and '"true"'
but rather the boolean values 'false' and 'true'.
2) Add the module to the various Windows description files.
VC++Files/libmysqld/libmysqld.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/libmysqld/libmysqld.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/libmysqld/libmysqld_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqldmax.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqldmax_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
sql/sql_locale.cc:
When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"'
but rather the boolean values 'false' and 'true'.
In the Windows build files, the "Max nt" configuration for some reason
had the mysql_client_test project disabled. Enable it.
VC++Files/mysql.sln:
The "Max nt" configuration for some reason had the mysql_client_test
project disabled. Enable it.
Improved definition of mysys configuration for -nt builds.
VC++Files/mysql.sln:
Use the name 'nt' instead of 'Release' for configuration.
VC++Files/mysys/mysys.vcproj:
Use the name 'nt' instead of 'Release' for configuration.
Use separate output files for NT and non-NT configurations.
Make sure for the mysys project that __NT__ is defined in *nt solution
configurations (but not in other configurations).
VC++Files/mysql.sln:
Define __NT__ in mysys for *nt configurations.
VC++Files/mysys/mysys.vcproj:
Add configurations with __NT__ defined.
mysql-test/mysql-test-run.pl:
Also allow testing a "Max nt" build.
and BUG#19208 "Test 'rpl000017' hangs on Windows".
Both bugs are caused by attempting to delete an opened
file and to create immediatedly a new one with the same
name. On Windows it can be supported only on NT-platforms
(by using FILE_SHARE_DELETE mode and with renaming the
file before deletion). Because deleting not-closed files
is not supported on all platforms (e.g. Win 98|ME) this
is to be considered harmful and should be eliminated by
a "code redesign".
VC++Files/mysys/mysys.vcproj:
To be sure that __NT__ is defined for Win configurations.
Temporary, to be changed in more appropriate way.
include/my_sys.h:
Adding my_delete_allow_opened to be invoked to delete
a (possibly) not closed file on Windows NT-platforms.
mysys/my_delete.c:
Adding nt_share_delete() function implementing
a (possibly) not closed file deletion on Windows NT.
sql/log.cc:
MYSQL_LOG::reset_logs(): Deleting usually not
closed binlog files.
Fixed make_win_src_distribution.sh to return back dsp files
for yassl.
VC++Files/client/mysqldump.dsp:
my_user.c was missing.
VC++Files/client/mysqldump_ia64.dsp:
my_user.c was missing.
VC++Files/sql/mysqld.dsp:
my_user.c was missing.
VC++Files/sql/mysqld_ia64.dsp:
my_user.c was missing.
extra/yassl/yassl.dsp:
Added the YASSL_PREFIX flag.
scripts/make_win_src_distribution.sh:
Returned back dsp files from yassl.
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
VC++Files/client/mysql.dsp:
Auto merged
mysql-test/t/func_time.test:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
client/mysqldump.c:
Manual merge
mysql-test/r/func_time.result:
Manual merge
VC++Files/client/mysql.dsp:
Fixed omission of mysys\my_conio.c.
VC++Files/client/mysql_ia64.dsp:
Fixed omission of mysys\my_conio.c.
client/mysqldump.c:
VS compiler does not accept variable declarations within blocks.
Such a behaviour complies with the Standard C.
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:/Users/kent/mysql/bk/mysql-5.0-new
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
Set MYSQL_SERVER_SUFFIX from build scripts, not hard
code it into Visual Studio project files, bug#15974
VC++Files/bdb/bdb.vcproj:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/innobase/innobase.vcproj:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/libmysqld/libmysqld.vcproj:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/mysqldemb/mysqldemb.vcproj:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/mysys/mysys.vcproj:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
VC++Files/sql/mysqld.vcproj:
Set MYSQL_SERVER_SUFFIX from build scripts, not hard code into project files, bug#15974
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.
VC++Files/client/mysqldump.vcproj:
Add new file that was missing from .vcproj.
VC++Files/sql/mysqld.vcproj:
Add new file that was missing from .vcproj.
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
Fixed compiler error for Win32 build. #include "decimal.c" wrere no able to find decimal.c file.
sql/ha_innodb.cc:
Fixed compiler error for Win32 build.
sql/spatial.cc:
Fixed compiler error for Win32 build. float8get should be enclosed
in {} since it is macro on win32 and might cause unmatching blocks.
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
Fix a compile failure
BitKeeper/deleted/.del-protocol_cursor.cc~2a1ab8e023a166a4:
Delete: sql/protocol_cursor.cc
VC++Files/libmysqld/libmysqld.dsp:
Remove protocol_cursor.cpp (no longer used) from sources
VC++Files/sql/mysqld.dsp:
Remove protocol_cursor.cpp (no longer used) from sources
sql/mysqld.cc:
Fix a compile failure
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
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release
BUILD/SETUP.sh:
Auto merged
client/mysql.cc:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/des_key_file.cc:
Auto merged
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
into mysql.com:/opt/local/work/mysql-5.0-root
BitKeeper/etc/ignore:
auto-union
include/my_sys.h:
Auto merged
mysql-test/r/information_schema.result:
Auto merged
mysql-test/t/ctype_ujis.test:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/log.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
- reflect two "Makefile.am" changes in the respective "VC project" files,
- correct a typo in a (normally) unused macro parameter.
VC++Files/libmysqld/libmysqld.vcproj:
Reflect a change done by Kostja in the Unix "libmysqld/Makefile.am":
New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp".
VC++Files/sql/mysqld.vcproj:
Reflect a change done by Kostja in the Unix "sql/Makefile.am":
New file "sql/sql_cursor.cpp" replaces "sql/protocol_cursor.cpp".
sql/ha_federated.cc:
Correct a typo (matters only if "SAFEMALLOC" is set).
VC++Files/mysys/mysys.dsp:
Auto merged
VC++Files/mysys/mysys_ia64.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
myisam/mi_check.c:
Auto merged
myisam/myisamchk.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/rpl_multi_delete2.result:
Auto merged
mysql-test/t/innodb.test:
Auto merged
mysql-test/t/rpl_multi_delete2-slave.opt:
Auto merged
mysql-test/t/rpl_multi_delete2.test:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
