| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/tests/mysql_client_test.dsp:
Merge with fix to link debug version against debug yassl library
|
| |\
| | |
| | |
| | |
| | | |
mysql-test/mysql-test-run.pl:
Auto merged
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Handle case where SHELL isn't set in Cygwin
mysql_client_test.dsp:
Put output into the "client_debug" and "client_release" directories
VC++Files/tests/mysql_client_test.dsp:
Put output into the "client_debug" and "client_release" directories
mysql-test/mysql-test-run.pl:
Handle case where SHELL isn't set in Cygwin
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Corrected quoting of string "pro-nt"
VC++Files/sql/mysqld.dsp:
Corrected quoting of string "pro-nt"
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
into mysql.com:/home/jimw/my/mysql-5.0-clean
VC++Files/sql/mysqld.dsp:
Auto merged
sql/ha_federated.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/table.cc:
Auto merged
sql/item_strfunc.cc:
SCCS merged
|
| | |
| | |
| | |
| | |
| | | |
VC++Files/tests/mysql_client_test.dsp:
Link debug version against debug yassl library
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
VC++Files/sql/mysqld.dsp:
Link debug server against debug yassl
sql/examples/ha_archive.cc:
Fix type for variables used to store number of rows
Add cast when reading current position
sql/examples/ha_archive.h:
Fix variables used to store rows to ha_rows
sql/ha_federated.cc:
Remove unused variables, fix type of variable used to store query id
sql/item_strfunc.cc:
Remove unused variables
sql/sql_acl.cc:
Remove unused variables
sql/sql_lex.cc:
Add casts to fix type used for counting number of rows
sql/sql_lex.h:
Fix size of options to be ulong again
sql/sql_insert.cc:
Fix type of query id value
sql/sql_union.cc:
Cast value for number of rows to ha_rows
sql/sql_yacc.yy:
Remove unused variable
sql/table.cc:
Add casts for handling key_part lengths
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
VC++Files/libmysql/libmysql.dsp:
Add missing file
VC++Files/client/mysqlclient.dsp:
Add missing file
vio/viosocket.c:
Add missing parameter
|
| |
| |
| |
| |
| |
| |
| |
| | |
Corrected typo
VC++Files/sql/mysqld.dsp:
Corrected typo
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added /FD flag, to avoid include file warnings
mysqlclient.dsp:
Removed duplicate entry for "strings/ctype-cp932.c"
Added missing "mysys/my_access.c"
libmysqld.dsp:
Added missing "mysys/charset.c"
libmysqld.def:
Added symbol 'get_charset_name'
libmysqld/libmysqld.def:
Added symbol 'get_charset_name'
VC++Files/libmysqld/libmysqld.dsp:
Added missing "mysys/charset.c"
VC++Files/client/mysqlclient.dsp:
Removed duplicate entry for "strings/ctype-cp932.c"
Added missing "mysys/my_access.c"
VC++Files/client/mysqltest.dsp:
Added /FD flag, to avoid include file warnings
VC++Files/mysql-test/mysql_test_run_new.dsp:
Added /FD flag, to avoid include file warnings
VC++Files/tests/mysql_client_test.dsp:
Added /FD flag, to avoid include file warnings
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- removed some unreferenced variables
- fixed the libmysql project file by removing a duplicate file reference (merge error)
sql/item_func.cc:
- removed unused variable "Field" from Item_func_sp::sp_result_field
sql/sql_select.cc:
- removed unreferenced variable "filename" from create_tmp_table
sql/unireg.cc:
- removed unused variable "firstpos" from make_empty_rec
VC++Files/libmysql/libmysql.dsp:
- after-merge fix: removed duplicate file ctype-cp932.c
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
VC++Files/client/mysql.dsp:
added missing mysys.lib
VC++Files/client/mysqladmin.dsp:
added missing mysys.lib
VC++Files/client/mysqlimport.dsp:
added missing mysys.lib
VC++Files/client/mysqlshow.dsp:
added missing mysys.lib
VC++Files/libmysql/libmysql.dsp:
added missing mysys.lib
VC++Files/mysql.dsw:
added dependencies on mysys
include/config-win.h:
added missing constant
sql/sql_base.cc:
pulled declaration of table_list out of for-scope
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sql/sql_lex.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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"
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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()
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
their sources.
They were both undocumented and not much useful. Removal has been agreed with Mark, Miguel and MikeZ.
Removing winmysqladmin from the source (it was not included anymore in no Windows package). I'll do a test Windows noinstall.zip build before push.
MikeZ just removed mysqlshutdown and mysqlwatch from the installer scripts.
BitKeeper/deleted/.del-myshutdown.dsp~a8eee34a3d3ab679:
Delete: VC++Files/mysqlshutdown/myshutdown.dsp
BitKeeper/deleted/.del-myshutdown_ia64.dsp~dd2ad23d744ba1ba:
Delete: VC++Files/mysqlshutdown/myshutdown_ia64.dsp
BitKeeper/deleted/.del-mysql.ico~d4c55da4e911ced7:
Delete: VC++Files/mysqlshutdown/mysql.ico
BitKeeper/deleted/.del-mysqlshutdown.c~35d5feec4507d810:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.c
BitKeeper/deleted/.del-mysqlshutdown.dsp~27db1e088d39987c:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.dsp
BitKeeper/deleted/.del-mysqlshutdown.rc~454359c66381843c:
Delete: VC++Files/mysqlshutdown/mysqlshutdown.rc
BitKeeper/deleted/.del-mysqlshutdown_ia64.dsp~53fe7127af678bc:
Delete: VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp
BitKeeper/deleted/.del-mysqlwatch.c~de504821ede1cb8:
Delete: VC++Files/mysqlwatch/mysqlwatch.c
BitKeeper/deleted/.del-mysqlwatch.dsp~4699ddfb6ed23a6d:
Delete: VC++Files/mysqlwatch/mysqlwatch.dsp
BitKeeper/deleted/.del-mysqlwatch_ia64.dsp~1a11ce58f66a493:
Delete: VC++Files/mysqlwatch/mysqlwatch_ia64.dsp
BitKeeper/deleted/.del-db.cpp~6bbc3687ff8a2913:
Delete: VC++Files/winmysqladmin/db.cpp
BitKeeper/deleted/.del-db.h~e38deaf45dffa24d:
Delete: VC++Files/winmysqladmin/db.h
BitKeeper/deleted/.del-initsetup.cpp~b988f9ab7dbe4e92:
Delete: VC++Files/winmysqladmin/initsetup.cpp
BitKeeper/deleted/.del-initsetup.h~bc2a39769765e1a5:
Delete: VC++Files/winmysqladmin/initsetup.h
BitKeeper/deleted/.del-main.cpp~f822deb513ce0250:
Delete: VC++Files/winmysqladmin/main.cpp
BitKeeper/deleted/.del-Goahead.ico~805e753b7f13c6b7:
Delete: VC++Files/winmysqladmin/images/Goahead.ico
BitKeeper/deleted/.del-main.h~d17e73cf0b0cbf8:
Delete: VC++Files/winmysqladmin/main.h
BitKeeper/deleted/.del-mysql.h~a538c356e526804b:
Delete: VC++Files/winmysqladmin/mysql.h
BitKeeper/deleted/.del-mysql_com.h~8828acc269ca5036:
Delete: VC++Files/winmysqladmin/mysql_com.h
BitKeeper/deleted/.del-mysql_version.h~674dd1127ee25880:
Delete: VC++Files/winmysqladmin/mysql_version.h
BitKeeper/deleted/.del-winmysqladmin.cpp~bfac61f49813a983:
Delete: VC++Files/winmysqladmin/winmysqladmin.cpp
BitKeeper/deleted/.del-HELP.ICO~6b91d6eff4a7b11e:
Delete: VC++Files/winmysqladmin/images/HELP.ICO
BitKeeper/deleted/.del-INFO.ICO~b1eb08e87e0c1c3e:
Delete: VC++Files/winmysqladmin/images/INFO.ICO
BitKeeper/deleted/.del-Info.bmp~9c3c5afea29fa9b7:
Delete: VC++Files/winmysqladmin/images/Info.bmp
BitKeeper/deleted/.del-MYINI.ICO~91c77cc71d665f4:
Delete: VC++Files/winmysqladmin/images/MYINI.ICO
BitKeeper/deleted/.del-Myini.bmp~6cea36edbb94df3a:
Delete: VC++Files/winmysqladmin/images/Myini.bmp
BitKeeper/deleted/.del-Noentry.ico~6791fac163575069:
Delete: VC++Files/winmysqladmin/images/Noentry.ico
BitKeeper/deleted/.del-SETUP.BMP~43bd1e614fc7e5d5:
Delete: VC++Files/winmysqladmin/images/SETUP.BMP
BitKeeper/deleted/.del-Setup 16.bmp~9a9bf24a5dd952f3:
Delete: VC++Files/winmysqladmin/images/Setup 16.bmp
BitKeeper/deleted/.del-Table.ico~d64bf78e407b5e50:
Delete: VC++Files/winmysqladmin/images/Table.ico
BitKeeper/deleted/.del-Working.ico~f5cf304a7b6e592c:
Delete: VC++Files/winmysqladmin/images/Working.ico
BitKeeper/deleted/.del-database.ico~df8562312d9d9ed8:
Delete: VC++Files/winmysqladmin/images/database.ico
BitKeeper/deleted/.del-find.ico~44644ca5bab7901e:
Delete: VC++Files/winmysqladmin/images/find.ico
BitKeeper/deleted/.del-green.ico~88749a9a4ff83d25:
Delete: VC++Files/winmysqladmin/images/green.ico
BitKeeper/deleted/.del-help.bmp~bb6ac08cf7ab60d7:
Delete: VC++Files/winmysqladmin/images/help.bmp
BitKeeper/deleted/.del-initsetup.cpp~6704e992d966647f:
Delete: VC++Files/winmysqladmin/images/initsetup.cpp
BitKeeper/deleted/.del-killdb.ico~1043773bac9da67c:
Delete: VC++Files/winmysqladmin/images/killdb.ico
BitKeeper/deleted/.del-logo.ico~f00b08cd64695232:
Delete: VC++Files/winmysqladmin/images/logo.ico
BitKeeper/deleted/.del-multitrg.ico~52f787d7d9509533:
Delete: VC++Files/winmysqladmin/images/multitrg.ico
BitKeeper/deleted/.del-mysql-07.bmp~c157a2c3573b5c27:
Delete: VC++Files/winmysqladmin/images/mysql-07.bmp
BitKeeper/deleted/.del-mysql-17.bmp~99b3c90f96a9964b:
Delete: VC++Files/winmysqladmin/images/mysql-17.bmp
BitKeeper/deleted/.del-mysql.BMP~b58fe4f0c416291:
Delete: VC++Files/winmysqladmin/images/mysql.BMP
BitKeeper/deleted/.del-red.ico~179f5587e5a706c9:
Delete: VC++Files/winmysqladmin/images/red.ico
BitKeeper/deleted/.del-red22.BMP~bc47efefee4a5a86:
Delete: VC++Files/winmysqladmin/images/red22.BMP
BitKeeper/deleted/.del-see.bmp~c6863c3564387841:
Delete: VC++Files/winmysqladmin/images/see.bmp
VC++Files/mysql.dsw:
removing mysqlshutdown and mysqlwatch
VC++Files/mysql_ia64.dsw:
removing mysqlshutdown and mysqlwatch
|
|\ \ \ \
| |/ / /
|/| / /
| |/ /
| | |
| | |
| | |
| | |
| | | |
VC++Files/mysys/mysys.dsp:
Auto merged
include/my_sys.h:
Auto merged
sql/sql_db.cc:
Auto merged
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| | |
Corrected wrong exe naming from bad merge
VC++Files/sql/mysqld.dsp:
Corrected wrong exe naming from bad merge
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Build-tools/Do-compile:
SCCS merged
mysql-test/mysql-test-run.sh:
SCCS merged
scripts/make_win_src_distribution.sh:
SCCS merged
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
layers,
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/client/mysqladmin_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqldump_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqlimport_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqlshow_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/client/mysqltest_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/comp_err/comp_err_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/isamchk/isamchk_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysql/libmysql_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqld/examples/test_libmysqld_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqld/libmysqld_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/libmysqltest/myTest_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/my_print_defaults/my_print_defaults_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisam_ftdump/myisam_ftdump_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisamchk/myisamchk_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisamlog/myisamlog_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/myisampack/myisampack_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysql-test/mysql_test_run_new_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysql_ia64.dsw:
Fixes for Platform SDK SP1 beta1 (Window IA64)
Changed project order (dependency doesn't work with platform SDK)
VC++Files/mysqlbinlog/mysqlbinlog_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlcheck/mysqlcheck_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlmanager/MySqlManager_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlshutdown/mysqlshutdown_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/mysqlwatch/mysqlwatch_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/pack_isam/pack_isam_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/perror/perror_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/replace/replace_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/sql/mysqld_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/sql/mysqldmax_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/strings/strings_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/test1/test1_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/tests/mysql_client_test_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
VC++Files/thr_test/thr_test_ia64.dsp:
Fixes for Platform SDK SP1 beta1 (Window IA64)
|
| |
| |
| |
| |
| | |
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
|
| |
| |
| |
| |
| |
| |
| |
| | |
Corrected path to my_decimal.cpp
VC++Files/libmysqld/libmysqld.dsp:
Corrected path to my_decimal.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
mysys.dsp:
Added my_mmap
VC++Files/mysys/mysys.dsp:
Added my_mmap
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
since I am trusting Kent...). No windows compiles here folks...
VC++Files/tests/mysql_client_test.dsp:
fix request by Kent
sql/item.cc:
fix requested by kent
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|