summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Make it buildable with -ansi flag on some platforms.unknown2005-11-241-0/+2
| | | | | | | | | extra/innochecksum.c: Define _XOPEN_SOURCE in order to include getopt.h when needed. The problem is that some platforms (for instance, SuSE 9.1/gcc-3.3.3) do not include getopt.h unless _XOPEN_SOURCE is defined, so optarg is undefined and the compiler complains.
* Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-194-3/+6
|\ | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
| * Additional "make distcheck" changes specific to 5.0unknown2005-11-094-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Removed duplicate "tools/Makefile", and unused AVAILABLE_LANGUAGES_ERRORS Docs/Makefile.am: Add generated files to explicitly be removed on "make distclean" extra/Makefile.am: Added empty SUBDIRS, else automake 1.6.3 will not put out code for DIST_SUBDIRS handling extra/yassl/Makefile.am: "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type extra/yassl/src/Makefile.am: "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type extra/yassl/taocrypt/src/Makefile.am: "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type sql/share/Makefile.am: Added distclean target for "*/errmsg.sys" client/Makefile.am: Put links into current directory, not \$(srcdir)
* | Bug#13957 yassl: opensrv6c compile failureunknown2005-11-032-6/+8
|/ | | | | | | | | | | | | - Added some ifdefs and turn off auto template instantiation, use explicit template instantiation configure.in: Use -Tno_implict to indicate that we specifiy which template should be instantiated. Turn on HAVE_EXPLICIT_TEMPLATE_INSTATNTIATION extra/yassl/src/socket_wrapper.cpp: Include sys/filio.h if __SCO_VERSION__ is defined extra/yassl/src/timer.cpp: Dont' include files from within namespace yaSSL.
* Update after merge, include libtaoint-integer.o into libtaocrypt.aunknown2005-10-281-4/+7
| | | | | extra/yassl/taocrypt/src/Makefile.am: Build libtaoint first and then link the .o file from that into libtaocrypt.a
* Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985unknown2005-10-282-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 config/ac-macros/yassl.m4: Auto merged configure.in: Auto merged libmysqld/Makefile.am: Auto merged sql/Makefile.am: Auto merged extra/yassl/taocrypt/src/Makefile.am: Manual merge
| * BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linkingunknown2005-10-272-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove yassl_libsfrom CLIENT_LIBS var - Add yassl_libs to libmysql and libmysqld config/ac-macros/yassl.m4: Add variable yassl_libs_with_path variable for libmysqld configure.in: Don't add yassl_libs to CLIENT_LIBS var since clients will be linked with libmysqlclient that includes yassl libs. extra/yassl/src/Makefile.am: Make a normal .a lib extra/yassl/taocrypt/src/Makefile.am: Make a normal .a lib libmysql/Makefile.am: Add yassl_libs to libmysql libmysqld/Makefile.am: Add yassl_libss_with_path to libmysqld
* | Had to revert change, because it breaks compilation forunknown2005-10-141-1/+1
| | | | | | | | | | | | | | Netware. Hartmut informed about this.
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-061-2/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ndb/src/mgmsrv/Services.cpp: Auto merged
| * | added structured ndbd exit codesunknown2005-10-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a: Delete: ndb/src/kernel/error/ErrorMessages.hpp config/ac-macros/ha_ndbcluster.m4: add ndb mgmapi to ndbcluster_includes extra/perror.c: perror to print also ndbd exit codes ndb/include/Makefile.am: added new ndbd exit code include file to src distribution ndb/include/kernel/signaldata/EventReport.hpp: backported from 5.1, included node id in event report signal ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: backported from 5.1, included node id in event report signal
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-13071unknown2005-10-051-7/+23
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Fail when two messages exist for the same language for an error in theunknown2005-10-051-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | server error messages file. (Bug #13071) extra/comp_err.c: Fail when two messages for the same language are given for an error
* | | Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-302-6/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hartmut/projects/mysql/dev/5.0 ndb/tools/ndb_config.cpp: Auto merged
| * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-09-271-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug13163/my50-bug13163
| | * | | Bug #13163 yassl: aix52 crash with ssl turned onunknown2005-09-271-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | - It seems like malloc(0) returns a null pointer on aix52 extra/yassl/mySTL/vector.hpp: Don't allow malloc(0), if n is 0 use 1
| * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-09-271-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug13476/my50-bug13476
| | * | | Bug #13476 yassl: openserv compile failureunknown2005-09-261-5/+5
| | |/ / | | | | | | | | | | | | | | | | extra/yassl/taocrypt/include/hmac.hpp: Rename BSIZE to HMAC_BSIZE to avoid conflict with BSIZE on "openserv 3.2 5.0.7"
* | | | CygWin build fix (Bug #13640)unknown2005-09-301-1/+1
|/ / /
* | | Merge neptunus.(none):/home/msvensson/mysql/bug13164/my50-bug13164unknown2005-09-221-0/+4
|\ \ \ | |/ / |/| | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Bug #13164 yassl: "SSL connection error" on several platformsunknown2005-09-221-0/+4
| |/ | | | | | | | | | | | | | | | | - it's a requirement fo yaSSL that either /dev/urandom or /dev/random is available on the target system. - Added a fix that tries to open /dev/random if /dev/urandom is not available. extra/yassl/taocrypt/src/random.cpp: Try to open /dev/ranom if /dev/urandom is not available.
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-151-3/+15
|\ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug13029/my50-bug13029
| * | Bug #13029 YaSSL not compatibile w/ JSSE (Java implementation of SSL)unknown2005-09-151-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | -Applied patch from Todd extra/yassl/src/ssl.cpp: Call processReply until clientFinishedComplete or error
* | | Bug #12526 yassl: Crashes in "integer.cpp"unknown2005-09-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Disable inlining in integer.cp for sparc solaris Cun C++ 5.6 config/ac-macros/yassl.m4: Detect sparc Solaris + Sun C++ 5.6 and disable inlining for integer.cpp extra/yassl/taocrypt/src/Makefile.am: Compile integer.cpp into a separate lib in order to use special CXXFLAGS Add the integer.cpp lib to libtaocrypt.la
* | | Cset exclude: msvensson@neptunus.(none)|ChangeSet|20050913150614|63378unknown2005-09-141-4/+4
|/ / | | | | | | | | extra/yassl/taocrypt/src/integer.cpp: Exclude
* | Merge bk-internal:/home/bk/mysql-5.0unknown2005-09-131-4/+4
|\ \ | |/ |/| | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
| * BUG#12526 yassl: Crashes in "integer.cpp"unknown2005-09-131-4/+4
| | | | | | | | | | | | | | | | - Avoid problem with "Sun C++ 5.6 2004/07/15" extra/yassl/taocrypt/src/integer.cpp: - Remove "inline" from the more advanced functions of class portable
* | innochecksum.c:unknown2005-09-131-178/+200
| | | | | | | | | | | | | | | | | | | | Changed from C++ comments to C comments Did some adaption to MySQL Coding Style extra/innochecksum.c: Changed from C++ comments to C comments Did some adaption to MySQL Coding Style
* | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-122-5/+9
|\ \ | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/mysql-5.0
| * | Fix compiler errors on InnoDB offline checksum tool innochecksum.unknown2005-09-082-5/+9
| | | | | | | | | | | | | | | extra/Makefile.am: Add innochecksum back to compiled programs.
* | | comp_err.c:unknown2005-09-101-8/+8
|/ / | | | | | | | | | | | | | | Fix some comments. extra/comp_err.c: Fix some comments.
* | Merge bk-internal:/home/bk/mysql-5.0unknown2005-09-082-2/+5
|\ \ | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
| * | yassl fix for ia64 + iccunknown2005-09-082-2/+5
| |/ | | | | | | | | | | | | extra/yassl/taocrypt/include/runtime.hpp: Check for both __ICC and __INTEL_COMPILER extra/yassl/taocrypt/include/types.hpp: Check for both __ICC and __INTEL_COMPILER
* | Bug #12987 yassl: Compilation of integer.cpp fails on OS X Tigerunknown2005-09-071-1/+1
|/ | | | | extra/yassl/taocrypt/include/misc.hpp: Disable X86ASM on OsX
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-09-063-10/+3
|\ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug12715/my50-bug12715
| * Bug #12715 Compilation of yassl/algebra.ccp fails on buildqnx2unknown2005-09-063-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Workaround extra/yassl/mySTL/helpers.hpp: Workaround for QNX extra/yassl/mySTL/list.hpp: Use workaround for placement new extra/yassl/taocrypt/src/misc.cpp: Don't include <new>
* | comment out innochecksum until fixedunknown2005-09-061-1/+1
| |
* | Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-052-1/+303
|\ \ | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/new/mysql-5.0 BitKeeper/etc/ignore: auto-union
| * \ Merge jlindstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-07-202-1/+303
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into hundin.mysql.fi:/home/jan/new/mysql-5.0 BitKeeper/etc/ignore: auto-union
| | * | Added InnoDB offline file checksum utility.unknown2005-07-192-1/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/Makefile.am: Added innochecksum utility. BitKeeper/etc/ignore: Added extra/innochecksum to the ignore list
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-09-011-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug11286/my50-bug11286 client/mysqltest.c: Auto merged sql/sql_parse.cc: Auto merged
| * | | | Bug #11286 yassl incompatible with "load data infile"unknown2005-09-011-2/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make sure that mysqltest always uses ssl when connecting to the server. - Pass a i32-bit int variable as argument to FIONREAD ioctl. client/mysqltest.c: Set the flag CLIENT_REMENBER_OPTIONS so that all connection attempts from mysqltest is done with the same settings. Old impl caused mysqltest to loose all it's settings in the second connection attempt, ex ssl settings. extra/yassl/src/socket_wrapper.cpp: 64-bit Solaris requires the variable passed to FIONREAD be a 32-bit value. Using "int" unless _WIN32_ is defined. sql/sql_parse.cc: Update error message when sslaccepts fails. Must have been a copy and paste error. vio/viossl.c: Minor fixes Add timeout to DBUG_PRINT use function vio_ssl_fd to get sd from vio Remove extra whitespace vio/viosslfactories.c: Remove DBUG_PRINT("enter" in sslaccept and sslconnect as it tries to print out null strings. That is not suported on all platforms.
* | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-09-011-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
| * | | | Bug #12717 yassl: Crashes in "integer.cpp" when compiled with iccunknown2005-09-011-0/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Temporary fix, disable x86 assembler. BUILD/compile-pentium-icc: Cleanup build script for icc extra/yassl/taocrypt/include/misc.hpp: Disable x86 assembler when compiling with icc BUILD/compile-pentium-icc-yassl: New BitKeeper file ``BUILD/compile-pentium-icc-yassl''
* | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1unknown2005-08-261-0/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0 BitKeeper/deleted/.del-isamchk.c~c0f59c2687d2248f: Auto merged BitKeeper/etc/config: Auto merged client/mysql.cc: Auto merged client/mysqlcheck.c: Auto merged BitKeeper/deleted/.del-pack_isam.c~43801f0df7504834: Auto merged client/mysqldump.c: Auto merged client/mysqlimport.c: Auto merged client/mysqlshow.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/help_end.h: Auto merged include/help_start.h: Auto merged myisam/myisamchk.c: Auto merged myisam/myisamlog.c: Auto merged myisam/myisampack.c: Auto merged netware/myisamchk.def: Auto merged netware/mysql.def: Auto merged netware/mysql_test_run.c: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqld_safe.c: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged sql/ha_blackhole.cc: Auto merged sql/ha_blackhole.h: Auto merged sql/mysqld.cc: Auto merged client/client_priv.h: Merged from 4.1 client/mysqladmin.cc: Merged from 4.1 client/mysqlbinlog.cc: Merged from 4.1 mysys/charset.c: Merged from 4.1
| * | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-08-251-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1 client/mysqlcheck.c: Auto merged client/mysqlimport.c: Auto merged client/mysqltest.c: Auto merged extra/my_print_defaults.c: Auto merged extra/perror.c: Auto merged extra/resolve_stack_dump.c: Auto merged include/help_end.h: Auto merged include/help_start.h: Auto merged isam/isamchk.c: Auto merged isam/pack_isam.c: Auto merged myisam/myisamlog.c: Auto merged netware/myisamchk.def: Auto merged netware/mysql.def: Auto merged netware/mysqladmin.def: Auto merged netware/mysqlbinlog.def: Auto merged netware/mysqlcheck.def: Auto merged netware/mysqldump.def: Auto merged netware/mysqlimport.def: Auto merged netware/mysqlshow.def: Auto merged client/client_priv.h: Merged from 4.0. client/mysql.cc: Merged from 4.0. client/mysqladmin.cc: Merged from 4.0. client/mysqlbinlog.cc: Merged from 4.0. client/mysqldump.c: Merged from 4.0. client/mysqlshow.c: Merged from 4.0. myisam/myisamchk.c: Merged from 4.0. myisam/myisampack.c: Merged from 4.0. netware/mysql_test_run.c: Merged from 4.0. netware/mysqld_safe.c: Merged from 4.0. sql/mysqld.cc: Merged from 4.0.
| | * | | Several fixes for Netware.unknown2005-08-243-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/client_priv.h: Added option auto close for Netware. client/mysql.cc: Added option auto close for Netware. client/mysqladmin.c: Added option auto close for Netware. client/mysqlbinlog.cc: Added option auto close for Netware. client/mysqlcheck.c: Added option auto close for Netware. client/mysqldump.c: Added option auto close for Netware. client/mysqlimport.c: Added option auto close for Netware. client/mysqlshow.c: Added option auto close for Netware. client/mysqltest.c: Fixed help messages for Netware. extra/my_print_defaults.c: Fixed help messages for Netware. extra/perror.c: Fixed help messages for Netware. extra/resolve_stack_dump.c: Fixed help messages for Netware. include/help_end.h: Fixed help messages for Netware. include/help_start.h: Fixed help messages for Netware. isam/isamchk.c: Added auto close of window for Netware isam/pack_isam.c: Added auto close of window for Netware myisam/myisamchk.c: Added auto close of window for Netware myisam/myisamlog.c: Added help for Netware. myisam/myisampack.c: Added auto close for Netware. netware/myisamchk.def: Scrollable screen patch. netware/mysql.def: Scrollable screen patch. netware/mysql_test_run.c: Fixed strindex for Netware. netware/mysqladmin.def: Scrollable screen patch. netware/mysqlbinlog.def: Scrollable screen patch. netware/mysqlcheck.def: Scrollable screen patch. netware/mysqld_safe.c: Removed debug message for Netware. netware/mysqldump.def: Scrollable screen patch. netware/mysqlimport.def: Scrollable screen patch. netware/mysqlshow.def: Scrollable screen patch. sql/mysqld.cc: Abnormal end patch when shutting down and volume not ready.
* | | | | Build YASSL libraries with libtool so correct PIC settings are usedunknown2005-08-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automatically. (Bug #12324) extra/yassl/src/Makefile.am: Build library with libtool extra/yassl/taocrypt/src/Makefile.am: Build library with libtool
* | | | | Conversions of dsp files to vcproj. These files are compatible with unknown2005-08-022-0/+1027
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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''
* | | | | fix for bug#5650 ('replace' does not follow symlinks)unknown2005-07-261-3/+9
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix now checks if the original (from) file is a symlink and uses the link name. This prevents creation of a new file (and loss of symlink) when renaming the tempfile.
* | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-07-191-1/+1
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean extra/perror.c: Auto merged include/my_global.h: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/select.result: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged sql/des_key_file.cc: Auto merged sql/field_conv.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_select.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/t/select.test: Resolve conflicts scripts/mysqld_safe.sh: Resolve conflict sql/item.cc: Resolve conflict, don't return FIELD_TYPE_BLOB since VARCHAR can be longer in 5.0 than 4.1. sql/log_event.cc: Resolve conflict sql/mysql_priv.h: Resolve conflict sql/mysqld.cc: Remove incorrect fix (merge from 4.1) sql/sql_show.cc: Resolve conflict
View Lorry Controller Status