into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
client/mysql.cc:
Auto merged
myisam/ft_boolean_search.c:
Auto merged
mysql-test/r/fulltext.result:
Auto merged
mysql-test/t/fulltext.test:
Auto merged
vio/viosocket.c:
Auto merged
More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysql.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqladmin.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/mysql.dsw:
More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqldump.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqlimport.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqlshow.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/client/mysqltest.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/libmysql/libmysql.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/libmysqld/libmysqld.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/mysqlcheck/mysqlcheck.dsp:
More yaSSL changes in Visual Studio 6 project files
VC++Files/tests/mysql_client_test.dsp:
More yaSSL changes in Visual Studio 6 project files
Enabled yaSSL on Windows
Many files:
Added yaSSL to Visual Studio 6 project files
VC++Files/mysql.dsw:
Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqlclient.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/client/mysqltest.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/sql/mysqld.dsp:
Added yaSSL to Visual Studio 6 project files
VC++Files/vio/vio.dsp:
Added yaSSL to Visual Studio 6 project files
include/config-win.h:
Enabled yaSSL on Windows
VC++Files/client/mysqlclient.dsp:
Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
Auto merged
VC++Files/client/mysqltest.dsp:
Auto merged
BitKeeper/deleted/.del-mysqlmanager.dsp~52d7a8f016396837:
Auto merged
VC++Files/libmysql/libmysql.dsp:
Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
Auto merged
VC++Files/strings/strings.dsp:
Auto merged
VC++Files/strings/strings_ia64.dsp:
Auto merged
include/config-win.h:
Auto merged
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge, fixed NDB_VERSION_BUILD
myisammrg/myrg_open.c:
Auto merged
mysys/my_getwd.c:
Auto merged
sql/ha_myisammrg.cc:
Auto merged
configure.in:
- manual merge (corrected version number)
mysql_test_run_new project files
VC++Files/mysql-test/mysql_test_run_new.dsp:
- added libpath option so that zlib.lib will be found
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
- added libpath option so that zlib.lib will be found
- fixed linking with zlib
VC++Files/client/mysql.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysql_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqladmin_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlcheck_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlclient.dsp:
- added ctype-cp932.c to the file list
VC++Files/client/mysqlclient_ia64.dsp:
- added ctype-cp932.c to the file list
VC++Files/client/mysqldump.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqldump_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlimport_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqlshow_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqltest.dsp:
- added zlib.lib to the LINK32 options
VC++Files/client/mysqltest_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/libmysql/libmysql.dsp:
- added ctype-cp932.c to the file list
VC++Files/libmysql/libmysql_ia64.dsp:
- added ctype-cp932.c to the file list
VC++Files/mysql-test/mysql_test_run_new.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
- added zlib.lib to the LINK32 options
VC++Files/mysqlmanager/mysqlmanager.dsp:
- added zlib.lib to the LINK32 options
VC++Files/strings/strings_ia64.dsp:
- added ctype-cp932.c to the file list
Use local seach path for "mysql_priv.h"
mysqld.dsp:
Added the ARCHIVE storage engine to max
ha_archive.h:
VC6, but not VC7, needs a cast of byte[] to char* to make
the compile select the right conversion function in String
sql/examples/ha_archive.h:
VC6, but not VC7, needs a cast of byte[] to char* to make
the compile select the right conversion function in String
VC++Files/sql/mysqld.dsp:
Added the ARCHIVE storage engine to max
sql/examples/ha_archive.cc:
Use local seach path for "mysql_priv.h"
VC++Files/strings/strings.dsp:
- added ctype-cp932.c to the project (new charset)
include/config-win.h:
- added a HAVE_CHARSET_cp932 #define to enable the cp932 charset
on Windows
Added BLACKHOLE and FEDERATED storage engines for max builds
Some preparations for including yaSSL
ha_federated.cc:
Use local seach path for "mysql_priv.h"
sql/ha_federated.cc:
Use local seach path for "mysql_priv.h"
VC++Files/sql/mysqld.dsp:
Added BLACKHOLE and FEDERATED storage engines for max builds
Some preparations for including yaSSL
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_global.h:
Auto merged
myisam/rt_split.c:
Auto merged
sql/field_conv.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_select.cc:
Auto merged
strings/my_vsnprintf.c:
Auto merged
Use MY_STAT to declare argument to my_fstat()
des_key_file.cc:
Use local seach path for "mysql_priv.h"
mysys.dsp, libmysqld.dsp, libmysql.dsp:
New file needed, "../mysys/default_modify.c"
VC++Files/libmysql/libmysql.dsp:
New file needed, "../mysys/default_modify.c"
VC++Files/libmysqld/libmysqld.dsp:
New file needed, "../mysys/default_modify.c"
VC++Files/mysys/mysys.dsp:
New file needed, "../mysys/default_modify.c"
sql/des_key_file.cc:
Use local seach path for "mysql_priv.h"
mysys/default_modify.c:
Use MY_STAT to declare argument to my_fstat()
The problem was that on Windows the access method indicates that access to file
such as "com1" and "lpt1" is allowed (since they are device names) and
this causes mysql to attempt to open them as databases or tables.
The fix was to write our own my_access method that uses other Win32 functions
to determine if the given argument is indeed a file and has to requested
mode.
VC++Files/mysys/mysys.dsp:
added my_access
VC++Files/mysys/mysys_ia64.dsp:
added my_access.c
include/my_sys.h:
if on windows, we use my_access.
if not on windows, then my_access points to the native access method
mysys/Makefile.am:
added my_access to mysys build file
mysys/mf_pack.c:
changed call to access to my_access
sql/sql_db.cc:
changed call to access to my_access
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
mysql.cc:
Removed unused variable 'field' from print_warnings()
libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/client/mysqlclient.dsp:
Added "my_chsize.c"
VC++Files/libmysql/libmysql.dsp:
Added "my_chsize.c" and "my_seek.c"
client/mysql.cc:
Removed unused variable 'field' from print_warnings()
mysys/default.c:
Disabled use of GetSystemWindowsDirectory() when compiled with VC6
- Removed use of mysql->extra_info
- Removed unused function send_records_num
VC++Files/winmysqladmin/mysql.h:
Comment extra_info as not used anymore
client/mysqlshow.c:
Remove use of extra info. Instead read number of records in table using SELECT COUNT(*)
include/mysql.h:
Comment extra_info as not used anymore
libmysqld/lib_sql.cc:
Removed unused function send_records_num
sql-common/client.c:
Remove use of extra_info since number of records is not sent in the protocol anymore
sql/protocol.cc:
Removed unused function send_records_num
sql/protocol.h:
Removed unused function send_records_num
VC++Files/client/mysqlclient.dsp:
Add new character sets
VC++Files/client/mysqlclient_ia64.dsp:
Add new character sets
VC++Files/libmysql/libmysql.dsp:
Add new character sets
VC++Files/libmysql/libmysql_ia64.dsp:
Add new character sets
VC++Files/strings/strings.dsp:
Add new character sets
VC++Files/strings/strings_ia64.dsp:
Add new character sets
include/config-win.h:
Add new character sets
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts.
Post review fixes.
VC++Files/mysys/mysys.dsp:
Add my_windac.c to mysys.lib
include/my_sys.h:
Declarations for SECURITY_ATTRIBUTES create/destroy functions.
mysys/Makefile.am:
Add my_windac.c to the list of compiled files.
sql-common/client.c:
Lower requested access rights for events as the server won't
provide clients with ALL access in order to prevent denial
of service attack.
sql/mysqld.cc:
Set proper security attributes for the kernel objects to make them
usable when mysqld is running as a Windows service.
BitKeeper/deleted/.del-MySqlManager_ia64.dsp~179439d0832c941e:
Delete: VC++Files/mysqlmanager/MySqlManager_ia64.dsp
VC++Files/mysql.dsw:
Remove MySqlManager and references to it
VC++Files/mysql_ia64.dsw:
Remove references to MySqlManager
libmysqld/libmysqld.def:
Bump version number, add two symbols
VC++Files/libmysqld/examples/test_libmysqld.dsp:
Fix target name
Remove unwanted dependency
adapt the Windows build files accordingly.
VC++Files/tests/mysql_client_test.dsp:
As the directory structure on Windows now resembles that on Unix (no more
"tests/tests", by the correction in "make_win_src_distribution.sh"), the location
of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
VC++Files/tests/mysql_client_test_ia64.dsp:
As the directory structure on Windows now resembles that on Unix (no more
"tests/tests", by the correction in "make_win_src_distribution.sh"), the location
of "mysql_client_test.*" has changed. Adapt the build tools accordingly.
scripts/make_win_src_distribution.sh:
1) The semantics of "cp -R src targ" depend on the (non)existence of "targ".
By simply doing "$CP -R $i $BASE/$i", the directory hierarchy below $BASE differed
from the source for each "$i" that already existed as a target directory.
This is now prevented by checking the existence and adapting the command.
2) Comment where "$BASE" (the target directory) comes into existence.
3) Introduce an "abort" function as a start point for more sanity checks, use it.
BitKeeper/etc/ignore:
auto-union
BitKeeper/etc/logging_ok:
auto-union
Build-tools/Do-compile:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
include/my_sys.h:
Auto merged
innobase/buf/buf0lru.c:
Auto merged
innobase/dict/dict0dict.c:
Auto merged
innobase/include/page0page.ic:
Auto merged
innobase/include/srv0srv.h:
Auto merged
innobase/os/os0thread.c:
Auto merged
innobase/rem/rem0cmp.c:
Auto merged
innobase/row/row0mysql.c:
Auto merged
innobase/row/row0sel.c:
Auto merged
innobase/srv/srv0srv.c:
Auto merged
innobase/trx/trx0sys.c:
Auto merged
innobase/trx/trx0trx.c:
Auto merged
innobase/ut/ut0ut.c:
Auto merged
myisam/ft_parser.c:
Auto merged
myisam/mi_create.c:
Auto merged
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ndb_alter_table.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/ndb_alter_table.test:
Auto merged
mysys/hash.c:
Auto merged
mysys/my_bitmap.c:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
scripts/make_win_src_distribution.sh:
Auto merged
sql/net_serv.cc:
Auto merged
sql/sql_select.cc:
Auto merged
VC++Files/libmysqld/libmysqld.dsp:
added sql/my_decimal.cc
VC++Files/sql/mysqld.dsp:
added my_decimal.cpp
VC++Files/strings/strings.dsp:
added decimal.c
sql/field.cc:
conversion fixes for windows compilation
sql/item.h:
fix for windows compilation
sql/item_func.cc:
fixed conversion for windows (cast from ulonglong to double
is not supported)
sql/item_sum.cc:
typecast fix for windows compilation
sql/sp_head.cc:
typecast fix fo windows compilation
sql/sql_cache.cc:
typecast fix for windows compilation
BitKeeper/etc/logging_ok:
auto-union
BitKeeper/triggers/post-commit:
Auto merged
include/my_pthread.h:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
sql/item.cc:
Auto merged
sql/log.cc:
Auto merged
sql/table.cc:
SCCS merged
VC++Files/mysql.dsw:
Auto merged
mysql-test/my_create_tables.c:
Auto merged
mysql-test/my_manage.c:
Auto merged
mysql-test/t/ps_1general.test:
Auto merged
renamed client_test to mysql_client_test
fixed name for lstat in removef()
added mysql-debug.exe for Windows
added enviroment variable MYSQL_CLIENT_TEST
added cleaning directory before tests
New BitKeeper file ``VC++Files/tests/mysql_client_test.dsp''
Delete: VC++Files/tests/client_test.dsp
BitKeeper/deleted/.del-client_test.dsp~659d0237a4c12ea1:
Delete: VC++Files/tests/client_test.dsp
VC++Files/mysql.dsw:
renamed client_test to mysql_client_test
mysql-test/my_manage.c:
fixed name for lstat in removef()
mysql-test/mysql_test_run_new.c:
added mysql-debug.exe for Windows
added enviroment variable MYSQL_CLIENT_TEST
added cleaning directory before tests
added client_test.dsp in project
added CHARACTER SET in tables
added 5th time zone
included lstat in if()
expanded ignore list for windows
added directory slave1 and slave2
added options for mysqld and mysqltest
fixed error in read_option()
fixed and added enviroment variables for Linux and Windows
rewrote str_tok()
added replacment 3th column
New BitKeeper file ``VC++Files/tests/client_test.dsp''
VC++Files/mysql.dsw:
added client_test.dsp in project
mysql-test/my_create_tables.c:
added CHARACTER SET in tables
added 5th time zone
mysql-test/my_manage.c:
included lstat in if()
mysql-test/mysql_test_run_new.c:
expanded ignore list for windows
added directory slave1 and slave2
added options for mysqld and mysqltest
fixed error in read_option()
fixed and added enviroment variables for Linux and Windows
rewrote str_tok()
mysql-test/t/ps_1general.test:
added replacment 3th column
failed to find the newly introduced extra/mysqld_ername.h header file)
VC++Files/client/mysqltest.dsp:
- added "../extra" to the include path (Windows compile failed to find the
newly introduced extra/mysqld_ername.h header file)
(After review of cs georg:1.1800 by Monty)
VC++Files/libmysqld/libmysqld.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
VC++Files/mysqldemb/mysqldemb.dsp:
removed ha_isammrg.cpp (doesn't exist anymore)
extra/comp_err.c:
renamed DATADIR to DATADIRECTORY (DATADIR is a windows internal
enumeration type)
innobase/ut/ut0ut.c:
gettimeofday is not available under Windows. Added conditional define
which uses GetLocalTime for windows
libmysql/libmysql.c:
fixed prototype for setup_one_fetch_function which differed from
function declaration.
Fixed not supported unsigned __int64 to double conversion
sql/field.h:
fixed typecast error (windows)
sql/item_sum.cc:
fixed typecast errors (windows)
sql/key.cc:
fixed typecast errors (windows)
sql/opt_range.cc:
fixed not supported unsigned __int64 to double conversion
sql/sql_acl.cc:
fixed typecast errors (windows)
sql/table.cc:
fixed typecast errors (windows)
VC++Files/libmysqld/libmysqld.dsp:
Auto merged
client/mysql.cc:
Auto merged
include/my_sys.h:
Auto merged
libmysqld/lib_sql.cc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/suma/Suma.cpp:
Auto merged
ndb/src/mgmsrv/InitConfigFileParser.cpp:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/strfunc.cc:
Auto merged
VC++Files/sql/mysqld.dsp:
Libraries changed
mysys/default.c:
get_defaults_files implementation added
sql/sql_base.cc:
merging
sql/sql_show.cc:
merging
