Commit graph

289 commits

Author SHA1 Message Date
unknown
aa7bc459f7 merged
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
2005-09-21 13:53:22 +02:00
unknown
05368f8bcf More fixes to the VC 7.1 solution and vcproj files
VC++Files/myisamchk/myisamchk.vcproj:
  removed hard coded library dependencies
VC++Files/mysql.sln:
  more solution fixups
VC++Files/tests/mysql_client_test.vcproj:
  removed hard coded lib dependencies
2005-09-19 23:23:23 -05:00
unknown
ec71d8854b hopefully final set of changes to the libmysqld targets
VC++Files/mysql.sln:
  fixed embedded targets
2005-09-16 22:51:34 -05:00
unknown
723236944f more fixes to the vcproj build process
VC++Files/libmysqld/libmysqld.vcproj:
  cleaned up the dependencies on the embedded server
VC++Files/mysql.sln:
  fixed up more of the inter-project dependencies
2005-09-16 20:07:39 -05:00
unknown
627bf43d9f Fixes bug #12929. Uses my_cgets instead of _cgets function, thus eliminating
a restriction to 255 chars for editable buffer.


VC++Files/mysys/mysys.dsp:
  Added my_conio.c
VC++Files/mysys/mysys_ia64.dsp:
  Added my_conio.c
include/my_sys.h:
  Added declarations for my_conio.c functions
mysys/my_conio.c:
  Added _cgets() replacement that is not limited to 255 chars retrieval
  from win32 console.
2005-09-16 01:56:16 +04:00
unknown
dc6b96dd46 some last minute Windows compile fixes and makefile corrections
VC++Files/libmysqld/libmysqld.vcproj:
  don't recall exactly what this change was.
VC++Files/libmysqltest/myTest.vcproj:
  redirect to client_release and client_debug folders
VC++Files/mysql.sln:
  remove bdb from embedded classic target
VC++Files/mysqlserver/mysqlserver.vcproj:
  redirect to lib_release and lib_debug folders
server-tools/instance-manager/mysqlmanager.vcproj:
  redirect to proper folders
sql/ha_federated.cc:
  fix windows compile problems
sql/sql_acl.cc:
  fix windows compile problems
sql/table.cc:
  fix windows compile problems
sql/unireg.cc:
  fix windows compile problems
VC++Files/mysqlserver/dummy.cpp:
  added new file to make mysqlserver generate a lib
2005-09-15 14:32:01 -05:00
unknown
9f92c88f43 A few changes to fix compiling on Windows
VC++Files/mysql.sln:
  Added instance manager project
VC++Files/mysys/mysys.vcproj:
  Added mf_unixpath.c
scripts/make_win_src_distribution.sh:
  Updated to include server-tools folder (which includes IM)
server-tools/instance-manager/instance.cc:
  fixed typo
server-tools/instance-manager/mysqlmanager.vcproj:
  fixed up all the filenames in the IM project
2005-09-06 18:06:06 -06:00
unknown
bffb5d0048 Fixes bug #11815. Convert file path to UNIX format to build correct query
string while replicating LOAD DATA INFILE statement.


VC++Files/mysys/mysys.dsp:
  added mf_unixpath.c into mysys.dsp
include/my_sys.h:
  Added an option for fn_format function to convert path from system representation
  to UNIX format.
mysys/mf_format.c:
  Added an option for fn_format function to convert path from system
  representation to UNIX format.
sql/log_event.cc:
  Convert file path to UNIX format to build correct query string while replicating
  LOAD DATA INFILE statement.
2005-08-30 22:19:15 +04:00
unknown
4a226f6ac0 libmysqld.vcproj:
Changed spelling "Commerical" to "Commercial"
mysqld.vcproj:
  Aligned engines with Unix version
sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does


include/my_global.h:
  Can't assume macro set_timespec_nsec exists if set_timespec does
sql/sql_class.cc:
  VC7 needs my_free() cast of first arg to be (gptr)
VC++Files/sql/mysqld.vcproj:
  Aligned engines with Unix version
VC++Files/libmysqld/libmysqld.vcproj:
  Changed spelling "Commerical" to "Commercial"
2005-08-25 23:24:43 +02:00
unknown
173e5df37f Merge mishka.local:/home/my/mysql-4.1
into  mishka.local:/home/my/mysql-5.0


BitKeeper/etc/ignore:
  auto-union
BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667:
  Auto merged
BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
BitKeeper/deleted/.del-have_lowercase0.inc:
  Delete: mysql-test/include/have_lowercase0.inc
VC++Files/mysql-test/mysql_test_run_new.dsp:
  Auto merged
configure.in:
  Auto merged
mysql-test/include/ps_conv.inc:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_example.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
VC++Files/client/mysqltest.dsp:
  manual merge
VC++Files/sql/mysqld.dsp:
  manual merge
mysql-test/r/grant2.result:
  patch merge
mysql-test/r/subselect2.result:
  manual merge
mysql-test/t/grant2.test:
  patch merge
mysys/charset.c:
  Remove already deleted function
sql/examples/ha_archive.h:
  Manual merge
sql/sql_acl.cc:
  manual merge
sql/sql_db.cc:
  merge (no differences)
sql/sql_select.cc:
  manual merge
sql/table.h:
  merge (no differences)
tests/mysql_client_test.c:
  patch merge
2005-08-25 06:55:48 +03:00
unknown
4536a103d0 mysqld.dsp:
Added archive and example storage engine to Windows build
ha_example.cc, ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
mysqltest.dsp, mysql_test_run_new.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/client/mysqltest.dsp:
  Added /FD flag, to avoid include file warnings
sql/examples/ha_archive.h:
  Windows VC6 compile needed (char*) cast of byte var
sql/examples/ha_archive.cc:
  Windows fix, use relative include path to "mysql_priv.h"
sql/examples/ha_example.cc:
  Windows fix, use relative include path to "mysql_priv.h"
VC++Files/sql/mysqld.dsp:
  Added archive and example storage engine to Windows build
2005-08-18 17:29:24 +02:00
unknown
741d3ae1d5 Some changes to project files
str_alloc had been added but was not added to mysqlclient and strings
libmysql should have had strings as a dependent.


VC++Files/client/mysqlclient.vcproj:
  Added missing file
VC++Files/mysql.sln:
  Make libmysql dependendent on strings
VC++Files/strings/strings.vcproj:
  Added missing file
2005-08-09 14:48:43 -05:00
unknown
5ba9aad278 mysqld.dsp:
Added the blackhole storage engine to the Max builds


VC++Files/sql/mysqld.dsp:
  Added the blackhole storage engine to the Max builds
2005-08-04 13:47:02 +02:00
unknown
937f46fb04 Merge mysql.com:/home/jimw/my/mysql-5.0-7003
into  mysql.com:/home/jimw/my/mysql-5.0-clean


VC++Files/client/mysqlclient.dsp:
  Auto merged
VC++Files/client/mysqlclient_ia64.dsp:
  Auto merged
VC++Files/libmysql/libmysql.dsp:
  Auto merged
VC++Files/libmysql/libmysql_ia64.dsp:
  Auto merged
VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
libmysql/Makefile.shared:
  Auto merged
sql/mysqld.cc:
  Auto merged
strings/Makefile.am:
  Auto merged
2005-08-02 16:50:09 -07:00
unknown
d67bd2104c Conversions of dsp files to vcproj. These files are compatible with
Visual Studio 2003.  I have not yet changed the windows build scripts
to use these.


VC++Files/bdb/bdb.vcproj:
  New BitKeeper file ``VC++Files/bdb/bdb.vcproj''
VC++Files/client/mysql.vcproj:
  New BitKeeper file ``VC++Files/client/mysql.vcproj''
VC++Files/client/mysqladmin.vcproj:
  New BitKeeper file ``VC++Files/client/mysqladmin.vcproj''
VC++Files/client/mysqlclient.vcproj:
  New BitKeeper file ``VC++Files/client/mysqlclient.vcproj''
VC++Files/client/mysqldump.vcproj:
  New BitKeeper file ``VC++Files/client/mysqldump.vcproj''
VC++Files/client/mysqlimport.vcproj:
  New BitKeeper file ``VC++Files/client/mysqlimport.vcproj''
VC++Files/client/mysqlshow.vcproj:
  New BitKeeper file ``VC++Files/client/mysqlshow.vcproj''
VC++Files/client/mysqltest.vcproj:
  New BitKeeper file ``VC++Files/client/mysqltest.vcproj''
VC++Files/comp_err/comp_err.vcproj:
  New BitKeeper file ``VC++Files/comp_err/comp_err.vcproj''
VC++Files/dbug/dbug.vcproj:
  New BitKeeper file ``VC++Files/dbug/dbug.vcproj''
VC++Files/heap/heap.vcproj:
  New BitKeeper file ``VC++Files/heap/heap.vcproj''
VC++Files/innobase/innobase.vcproj:
  New BitKeeper file ``VC++Files/innobase/innobase.vcproj''
VC++Files/libmysql/libmysql.vcproj:
  New BitKeeper file ``VC++Files/libmysql/libmysql.vcproj''
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New BitKeeper file ``VC++Files/libmysqld/examples/test_libmysqld.vcproj''
VC++Files/libmysqld/libmysqld.vcproj:
  New BitKeeper file ``VC++Files/libmysqld/libmysqld.vcproj''
VC++Files/libmysqltest/myTest.vcproj:
  New BitKeeper file ``VC++Files/libmysqltest/myTest.vcproj''
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New BitKeeper file ``VC++Files/my_print_defaults/my_print_defaults.vcproj''
VC++Files/myisam/myisam.vcproj:
  New BitKeeper file ``VC++Files/myisam/myisam.vcproj''
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New BitKeeper file ``VC++Files/myisam_ftdump/myisam_ftdump.vcproj''
VC++Files/myisamchk/myisamchk.vcproj:
  New BitKeeper file ``VC++Files/myisamchk/myisamchk.vcproj''
VC++Files/myisamlog/myisamlog.vcproj:
  New BitKeeper file ``VC++Files/myisamlog/myisamlog.vcproj''
VC++Files/myisammrg/myisammrg.vcproj:
  New BitKeeper file ``VC++Files/myisammrg/myisammrg.vcproj''
VC++Files/myisampack/myisampack.vcproj:
  New BitKeeper file ``VC++Files/myisampack/myisampack.vcproj''
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New BitKeeper file ``VC++Files/mysql-test/mysql_test_run_new.vcproj''
VC++Files/mysql.sln:
  New BitKeeper file ``VC++Files/mysql.sln''
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New BitKeeper file ``VC++Files/mysqlbinlog/mysqlbinlog.vcproj''
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New BitKeeper file ``VC++Files/mysqlcheck/mysqlcheck.vcproj''
VC++Files/mysqldemb/mysqldemb.vcproj:
  New BitKeeper file ``VC++Files/mysqldemb/mysqldemb.vcproj''
VC++Files/mysqlserver/mysqlserver.vcproj:
  New BitKeeper file ``VC++Files/mysqlserver/mysqlserver.vcproj''
VC++Files/mysys/mysys.vcproj:
  New BitKeeper file ``VC++Files/mysys/mysys.vcproj''
VC++Files/perror/perror.vcproj:
  New BitKeeper file ``VC++Files/perror/perror.vcproj''
VC++Files/regex/regex.vcproj:
  New BitKeeper file ``VC++Files/regex/regex.vcproj''
VC++Files/replace/replace.vcproj:
  New BitKeeper file ``VC++Files/replace/replace.vcproj''
VC++Files/sql/mysqld.vcproj:
  New BitKeeper file ``VC++Files/sql/mysqld.vcproj''
VC++Files/strings/strings.vcproj:
  New BitKeeper file ``VC++Files/strings/strings.vcproj''
VC++Files/test1/test1.vcproj:
  New BitKeeper file ``VC++Files/test1/test1.vcproj''
VC++Files/tests/mysql_client_test.vcproj:
  New BitKeeper file ``VC++Files/tests/mysql_client_test.vcproj''
VC++Files/thr_test/thr_test.vcproj:
  New BitKeeper file ``VC++Files/thr_test/thr_test.vcproj''
VC++Files/vio/vio.vcproj:
  New BitKeeper file ``VC++Files/vio/vio.vcproj''
VC++Files/zlib/zlib.vcproj:
  New BitKeeper file ``VC++Files/zlib/zlib.vcproj''
extra/yassl/taocrypt/taocrypt.vcproj:
  New BitKeeper file ``extra/yassl/taocrypt/taocrypt.vcproj''
extra/yassl/yassl.vcproj:
  New BitKeeper file ``extra/yassl/yassl.vcproj''
2005-08-02 18:47:02 -05:00
unknown
6c40ce7654 Merge
VC++Files/client/mysqlclient_ia64.dsp:
  Auto merged
include/config-win.h:
  Auto merged
sql/item_sum.cc:
  SCCS merged
2005-07-31 02:44:18 -07:00
unknown
8cec845876 - fixed a typo in C++Files/client/mysqlclient_ia64.dsp: ctype-cp963.c -> ctype-cp932.c
(thanks to JoergB for spotting it)


VC++Files/client/mysqlclient_ia64.dsp:
  - fixed a typo: ctype-cp963.c -> ctype-cp932.c (thanks to JoergB for spotting it)
2005-07-29 12:37:27 +02:00
unknown
f1029fd7a7 Merge deer.(none):/home/hf/work/mysql-4.1.clean
into deer.(none):/home/hf/work/mysql-5.0.clean


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
2005-07-22 12:18:19 +05:00
unknown
afd6b4e8ae merging 2005-07-22 12:15:09 +05:00
unknown
be45e3a0f1 Fix for bug #12042 (User breakpoints calling free() in embedded library)
VC++Files/libmysqld/libmysqld.dsp:
  we should have SAFEMALLOC here
2005-07-21 17:17:46 +05:00
unknown
5b6c1348c7 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mishka.local:/home/my/mysql-5.0


client/mysqldump.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysys/Makefile.am:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysys/default.c:
  SCCS merged
2005-07-18 19:03:01 +03:00
unknown
68b4d7b74d Cleanups during review
Changed defaults option --instance to --defaults-group-suffix
Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX
mysql_print_defaults now understands --defaults-group-suffix
Remove usage of my_tempnam() (not safe function)
if( -> if ( and while( to while (


BitKeeper/deleted/.del-my_tempnam.c~a8562f15dad3012f:
  Delete: mysys/my_tempnam.c
VC++Files/client/mysqlclient.dsp:
  Remove not used file my_tempnam.c
VC++Files/client/mysqlclient_ia64.dsp:
  Remove not used file my_tempnam.c
VC++Files/libmysql/libmysql.dsp:
  Remove not used file my_tempnam.c
VC++Files/libmysql/libmysql_ia64.dsp:
  Remove not used file my_tempnam.c
VC++Files/mysys/mysys.dsp:
  Remove not used file my_tempnam.c
VC++Files/mysys/mysys_ia64.dsp:
  Remove not used file my_tempnam.c
client/mysql.cc:
  Change to use get_defaults_options()
  Remove compiler warnings
client/mysqldump.c:
  Indentation fixes
  Use quoted table name for 'primary_key_fields'
extra/my_print_defaults.c:
  Add support for --defaults-group-suffix
  change to use get_default_options()
extra/replace.c:
  Replace my_tempnam() with create_tmp_file() to allow us to remove my_tempnam.c
include/config-win.h:
  Added DEFAULT_GROUP_SUFFIX_ENV
include/my_sys.h:
  Change defaults_instance -> defaults_group_suffix
  Change get_defaults_files -> get_defaults_options
libmysql/Makefile.shared:
  Added DEFAULT_GROUP_SUFFIX_ENV
mysys/Makefile.am:
  Added DEFAULT_GROUP_SUFFIX_ENV
  Remove my_tempnam.c
mysys/default.c:
  Changed --instance to --defaults-group-suffix
  Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX and moved the name to Makefile.am
  (mysys shouldn't by MySQL independent)
  Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order
mysys/default_modify.c:
  Optimized code to use allocated space more efficently
  Reduce code size
  Ensure that realloc() works independent of argument size
mysys/my_bitmap.c:
  Added missing return
sql/ha_innodb.cc:
  Change if( -> if (
sql/ha_ndbcluster.cc:
  Change while( -> while (
sql/item_cmpfunc.cc:
  Break loop early (simple optimization)
sql/item_strfunc.cc:
  Change if( -> if (
sql/log.cc:
  Fixed comment
sql/mysqld.cc:
  Change if( -> if (
sql/opt_range.cc:
  while( -> while (
  if( -> if (
sql/parse_file.cc:
  Change if( -> if (
sql/sql_cache.cc:
  while( -> while (
sql/sql_parse.cc:
  Change if( -> if (
sql/sql_prepare.cc:
  Added comment
sql/sql_select.cc:
  while( -> while (
  Removed index variable by incrementing pointer
sql/sql_show.cc:
  Change if( -> if (
sql/sql_yacc.yy:
  Change if( -> if (
tests/mysql_client_test.c:
  Added cast to first argument to bzero()
2005-07-18 15:33:18 +03:00
unknown
327afd65b5 Merge
mysql-test/r/view.result:
  Auto merged
mysql-test/t/view.test:
  Auto merged
2005-07-13 02:39:23 +02:00
unknown
71602a1273 Merge
VC++Files/tests/mysql_client_test.dsp:
  Merge, and changed to use "Debug\yassl.lib" for debug build
2005-07-08 15:52:15 +02:00
unknown
6fcb956277 mysql_client_test.dsp:
Corrected libs and lib search path for debug target


VC++Files/tests/mysql_client_test.dsp:
  Corrected libs and lib search path for debug target
2005-07-08 15:36:57 +02:00
unknown
98a3bae33d Merge bk-internal:/home/bk/mysql-5.0
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
2005-07-06 19:05:36 -07:00
unknown
8a23dd8672 Merge jwinstead@production.mysql.com:my/mysql-5.0-11045
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
2005-07-06 16:49:04 -07:00
unknown
f3a84063a1 Merge
mysql-test/mysql-test-run.pl:
  Auto merged
2005-07-06 16:42:16 +02:00
unknown
b5081acd66 mysql-test-run.pl:
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
2005-07-06 16:17:32 +02:00
unknown
9c41fbda76 mysqld.dsp:
Corrected quoting of string "pro-nt"


VC++Files/sql/mysqld.dsp:
  Corrected quoting of string "pro-nt"
2005-06-28 04:37:01 +02:00
unknown
f56dd2a0fa Add my_str_malloc and _free function pointers to strings library
which will by default exit(1) if malloc() fails, but can be set
to do something else by the calling program does, which mysqld
does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks
allocation in conf_to_src utility program. (Bug #7003)


strings/conf_to_src.c:
  if malloc() fails, just abort
VC++Files/client/mysqlclient.dsp:
  Add str_alloc.c
VC++Files/client/mysqlclient_ia64.dsp:
  Add str_alloc.c
VC++Files/libmysql/libmysql.dsp:
  Add str_alloc.c
VC++Files/libmysql/libmysql_ia64.dsp:
  Add str_alloc.c
VC++Files/libmysqld/libmysqld.dsp:
  Add str_alloc.c
VC++Files/libmysqld/libmysqld_ia64.dsp:
  Add str_alloc.c
VC++Files/strings/backup/strings.dsp:
  Add str_alloc.c
VC++Files/strings/noMASM/strings.dsp:
  Add str_alloc.c
VC++Files/strings/strings.dsp:
  Add str_alloc.c
VC++Files/strings/strings_ia64.dsp:
  Add str_alloc.c
include/m_string.h:
  Add my_str_malloc/free function pointers.
libmysql/Makefile.shared:
  Add str_alloc.lo
sql/mysqld.cc:
  Reassign my_str_malloc/free pointers so they use my_malloc/free
strings/Makefile.am:
  Add str_alloc.c
strings/ctype-tis620.c:
  Use my_str_malloc/free
2005-06-24 13:41:33 -07:00
unknown
3f6501c5e5 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
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
2005-06-20 15:02:45 -07:00
unknown
2e70ec89f9 Fix another .dsp trying to link debug binary against release version of yassl
VC++Files/tests/mysql_client_test.dsp:
  Link debug version against debug yassl library
2005-06-18 02:03:49 +02:00
unknown
94d1d88658 Clean up warnings and build problems on Windows. (Bug #11045)
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
2005-06-18 01:55:42 +02:00
unknown
728ef761d4 mysqld.dsp:
Corrected typo


VC++Files/sql/mysqld.dsp:
  Corrected typo
2005-06-10 04:09:42 +02:00
unknown
2ea6a08e57 2005-06-09 18:02:07 +02:00
unknown
5d9cd6a35e Many files:
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
2005-06-09 16:53:08 +02:00
unknown
f63f15e7ab config-win.h:
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
2005-06-09 05:04:59 +02:00
unknown
92354ea6d6 mysql_client_test.dsp, mysql_test_run_new.dsp, mysqltest.dsp:
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
2005-06-09 00:49:37 +02:00
unknown
9a67ecc3e4 Fix Windows build warning and file missing from projects.
VC++Files/libmysql/libmysql.dsp:
  Add missing file
VC++Files/client/mysqlclient.dsp:
  Add missing file
vio/viosocket.c:
  Add missing parameter
2005-06-08 01:25:06 +02:00
unknown
a0d18bd492 Some Windows compile improvements:
- 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
2005-06-06 15:23:04 +02:00
unknown
1dd50e466d misc. fixes for windoze builds
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
2005-06-02 15:32:02 +02:00
unknown
29fb604ddf Merge of 4.1 -> 5.0
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
2005-06-01 15:11:14 +02:00
unknown
f30b7ed416 - merged the 4.1.12a Changes back into the main tree
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)
2005-05-26 11:43:47 +02:00
unknown
5ec889c798 Merge hasky:/my/mysql-build into mysql.com:/home/my/mysql-5.0
sql/sql_lex.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
2005-05-25 19:55:01 +03:00
unknown
1794eb3e2b - one more build fix for zlib.lib - added libpath to the
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
2005-05-25 10:55:21 +02:00
unknown
e9cf191ce0 - applied more changes to enable the CP932 charset on Windows
- 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
2005-05-24 22:42:43 +02:00
unknown
cfb54ed514 ha_archive.cc:
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"
2005-05-24 18:51:53 +02:00
unknown
4a80acecea - added the cp932 charset support to the Windows builds
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
2005-05-24 14:46:28 +02:00
unknown
d0afc3492e Merge gluh@gluh:/home/gluh/release/mysql-5.0-build
into mysql.com:/home/gluh/MySQL/Merge/mysql-5.0
2005-05-24 15:35:24 +05:00