summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-135-6/+6
|\ | | | | | | | | | | | | - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
| * Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-109-23/+23
| | | | | | | | | | | | - Remove bothersome warning messages. This change focuses on the warnings that are covered by the ignore file: support-files/compiler_warnings.supp. - Strings are guaranteed to be max uint in length
* | Bug#41612: resolve_stack_dump does not decode 5.1 stack traceDavi Arnaut2008-12-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | resolve_stack_dump is not able to decode a stack trace produced by glibc's backtrace() functions. The problem is that the stack trace addresses are printed between brackets and the utility is not able to ignore the brackets. The solution is to modify resolve_stack_dump so it can recognize stack trace addresses surrounded by brackets. e.g. [0xdeadbeef]. extra/resolve_stack_dump.c: Skip to after a bracket if one is present in the input.
* | Replace C++ comment in a header file. Thanks, Alik!Chad MILLER2008-12-081-2/+2
| |
* | Addendum to the fix for bug #39178: Server crash in YaSSL Georgi Kodinov2008-12-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | with non-RSA-requesting client if server uses RSA key matchSuite() may not find a match. It will return error in this case. Added a error checking code that will prevent using uninitialized memory in the code based on the assumption that matchSuite() has found a match. extra/yassl/src/yassl_imp.cpp: Bug #39178: Correct error checking added
* | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2008-11-271-2/+38
|\ \ | |/
| * Bug#34825 perror on windows doesn't know about win32 error codesSergey Glukhov2008-11-271-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | extended perror to enable printing of Win32 system errors extra/perror.c: extended perror to enable printing of Win32 system errors mysql-test/r/perror-win.result: test result mysql-test/t/perror-win.test: test case
| * Auto merge 5.0-build -> 5.0-bugteamTimothy Smith2008-09-101-1/+6
| |\
* | | Update to change for bug 39178. Revert error-handling change, perhapsChad MILLER2008-11-201-1/+1
| | | | | | | | | | | | | | | temporarily if yassl maintainer has plans for other error handling.
* | | Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \Chad MILLER2008-11-1811-97/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using crashes server When the server is configured to use a RSA key, and when the client sends a cipher-suite list that contains a non-RSA key as acceptable, the server would try to process that key even though it was impossible. Now, yaSSL sets its own acceptable-cipher list according to what kind of key the server is started with, and will never explore and try to pair impossible combinations. This involves a partial import of the current YaSSL tree, not the whole thing, so as to try to avoid introducing new bugs. (Updated to avoid many whitespace changes and make diff smaller.)
* | | Auto merge 5.1-build -> 5.1-bugteamTimothy Smith2008-09-101-1/+6
|\ \ \
| * \ \ Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM buildJoerg Bruehe2008-08-271-1/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge it up from 5.0 to 5.1, adapt to some version differences. configure.in: Add an "automake condition" whether InnoDB is configured so that we can evaluate it for the (non)generation of "innochecksum". In 5.1, the test command must differ from 5.0.
| | * | Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM buildJoerg Bruehe2008-08-251-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly, this affected files (programs, scripts, and manual pages) which got built during a RPM build but were not listed in the appropriate "%files" section of the "spec" file. This is fixed now, they are added. To make this consistent, this patch also makes the build of "innochecksum" (and its inclusion in a tar.gz or other package) depend on whether InnoDB is configured in the build. Also, some tools to create Windows packages are irrelevant in any binary Unix package (not the sources !), and so they are deleted before packaging. configure.in: To prevent "innochecksum" from getting built even if InnoDB is not configured (and then being included in such packages), we need an "automake condition" that evaluates whether we have InnoDB. extra/Makefile.am: Evaluate the new automake condition about having InnoDB, and make the build of "innochecksum" depend on it. man/Makefile.am: Cleanup: There are manual files which we do not need, like those about tools for Windows builds / packaging (irrelevant in any Unix binary package) and about NDB tools which do not get built. scripts/make_binary_distribution.sh: In any Unix binary package, do not include tools for Windows builds (and their manual pages). This does not affect source packages, of course. support-files/mysql.spec.sh: There were several files (binaries, scripts, and manuals) which got built with a RPM but never packages, add them to the respective RPM.
* | | | Fix "make dist" error - remove Visual Studio project files from Vladislav Vaintroub2008-09-012-3/+2
| | | | | | | | | | | | | | | | distribution
* | | | mergeVladislav Vaintroub2008-09-012-479/+0
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug #33907 : Errors compiling mysql with Microsoft Visual C++ Express 2008Vladislav Vaintroub2008-08-212-479/+0
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Cherry pick 6.0 changes for Visual Studio 2008 support - Add scripts win\build-vs9.bat and win\build-vs9_x64.bat Also, remove CMake generated visual studio project files. extra/yassl/taocrypt/taocrypt.vcproj: remove file that is generated each time by cmake extra/yassl/yassl.vcproj: remove file that is generated each time by cmake server-tools/instance-manager/mysqlmanager.vcproj: remove file that is generated each time by cmake win/build-vs9.bat: Add script for Visual Studio 2008 support win/build-vs9_x64.bat: Add script for Visual Studio 2008 support zlib/zutil.h: support Visual Studio 2008
| * | fixes for warnings and compile errors for the fix of bug 26243unknown2008-03-291-0/+2
| |/
* | perror.c:unknown2008-03-281-0/+1
| | | | | | | | | | | | | | | | fixed warning in 5.1-marvel in fix for bug 25177 extra/perror.c: fixed warning in 5.1-marvel in fix for bug 25177
* | Fixed problem with non-synchronous error listsunknown2008-03-281-49/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in perror and handler descriptors (BUG#25177) Fixed problem of masking mysql error by system error in perror (BUG#23028) extra/perror.c: Used common handlers error list. Fixed BUG#23028 ignoring mysql error in case of OS and mysql error codes overlapping. include/my_base.h: Added errors of maria engine. Fixed incorrect comment in #define (can be cause of seriouse problems) include/my_handler.h: Added ability to be included into C++ code. mysys/my_handler.c: Error texts moved to the separate files. mysys/my_handler_errors.h: New BitKeeper file ``mysys/my_handler_errors.h''
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-211-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into alf.(none):/src/mysql-5.1-build_31929 sql/CMakeLists.txt: Auto merged storage/myisam/CMakeLists.txt: Auto merged
| * | Bug#31929 Windows build fails with >=4 Parallel build threads.unknown2008-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add GenError Dependency to storage engines that include mysqld_error.h extra/yassl/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. sql/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/archive/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/blackhole/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/csv/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/example/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/federated/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/heap/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/innobase/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/myisam/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. storage/myisammrg/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency. vio/CMakeLists.txt: Bug#31929 Windows build fails with >=4 Parallel build threads. - Add GenError Dependency.
* | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-181-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gbichot4.local:/home/mysql_src/mysql-5.1-build-gca client/mysqltest.c: Auto merged include/my_sys.h: Auto merged mysys/thr_lock.c: Auto merged sql/set_var.cc: Auto merged sql/sql_plugin.cc: Auto merged
| * | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>unknown2008-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | value" error even though the value was correct): a C function in my_getopt.c was taking bool* in parameter and was called from C++ sql_plugin.cc, but on some Mac OS X sizeof(bool) is 1 in C and 4 in C++, giving funny mismatches. Fixed, all other occurences of bool in C are removed, future ones are blocked by a "C-bool-catcher" in my_global.h (use my_bool). client/mysqldump.c: my_bool for C client/mysqltest.c: my_bool for C extra/replace.c: my_bool for C include/my_getopt.h: my_bool for C include/my_global.h: Prevent people from using bool in C, it causes real bugs. include/my_sys.h: my_bool for C include/my_time.h: my_bool for C include/thr_lock.h: my_bool for C libmysql/libmysql.c: my_bool for C mysys/charset.c: my_bool for C mysys/my_getopt.c: my_bool for C mysys/queues.c: my_bool for C mysys/thr_lock.c: my_bool for C regex/reginit.c: my_bool for C sql/set_var.cc: C functions use my_bool so we must use my_bool too. sql/sql_plugin.cc: C functions use my_bool so we must use my_bool too. This fixes a real observed bug of Maria, because on some Mac OS X, sizeof(bool) is 1 in C and 4 in C++, so the bool* does wrong. Removing useless line. storage/heap/hp_update.c: my_bool for C storage/myisam/mi_check.c: my_bool for C storage/myisam/mi_dynrec.c: my_bool for C storage/myisam/mi_search.c: my_bool for C storage/myisam/mi_update.c: my_bool for C storage/myisam/mi_write.c: my_bool for C storage/myisam/myisamdef.h: my_bool for C storage/myisam/myisamlog.c: my_bool for C storage/myisam/myisampack.c: my_bool for C tests/mysql_client_test.c: my_bool for C unittest/mysys/bitmap-t.c: my_bool for C vio/viosslfactories.c: my_bool for C
* | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2008-02-131-0/+8
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build extra/resolveip.c: Auto merged
| * | | Make this build on Windows.unknown2008-02-111-0/+8
| | | | | | | | | | | | | | | | | | | | extra/resolveip.c: Regrettably, Windows does not have inet_aton. We still don't want to use inet_addr on all platforms, because it is inaccurate and deprecated on many.
| * | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2008-01-285-7/+27
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0 configure.in: Auto merged extra/resolveip.c: Auto merged
* | \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-01-285-7/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1 configure.in: Auto merged extra/CMakeLists.txt: Auto merged extra/resolveip.c: Auto merged mysql-test/t/disabled.def: Auto merged
| * | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2008-01-233-1/+16
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build configure.in: Auto merged extra/yassl/src/template_instnt.cpp: Auto merged extra/yassl/src/yassl_imp.cpp: Auto merged
| | * | | Merge dev:/data0/mysqldev/my/build-200801111340-5.0.54a/mysql-5.0-releaseunknown2008-01-233-1/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build configure.in: merge fix
| | | * \ \ Merge mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2008-01-113-1/+16
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/users/serg/mysql-5.0-release extra/yassl/src/handshake.cpp: Auto merged
| | | | * | | Bug#33814 - yassl problemsunknown2008-01-113-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/yassl/src/template_instnt.cpp: new template instantiation
| * | | | | | Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-buildunknown2007-12-282-6/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build extra/CMakeLists.txt: Auto merged extra/resolveip.c: Auto merged scripts/CMakeLists.txt: Auto merged scripts/Makefile.am: Auto merged scripts/make_win_bin_dist: Auto merged scripts/mysql_convert_table_format.sh: Auto merged scripts/mysqld_multi.sh: Auto merged BitKeeper/deleted/.del-mysql_explain_log.sh~5ddc62808e16bd57: Auto merged BitKeeper/deleted/.del-mysql_tableinfo.sh~c715458838a2a818: Auto merged
| | * | | | make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:unknown2007-12-282-6/+11
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Better Windows support in the scripts directory mysql_config.pl.in, mysql_install_db.pl.in: New Perl version of Unix shell script, mainly for Windows Many files in scripts directory: Use default Perl location "#!/usr/bin/perl" instead of the build host path extra/CMakeLists.txt: Added target for executable "resolveip" extra/resolveip.c: Exclude Unix specific headers when compiling on Windows scripts/CMakeLists.txt: On Windows, filter Perl scripts and change name from ".sh" to ".pl" mysql_convert_table_format.sh mysql_explain_log.sh mysql_secure_installation.sh mysql_tableinfo.sh mysqld_multi.sh mysqldumpslow.sh mysqlhotcopy.sh Do the same for the new Windows specific Perl versions of shell scripts mysql_config.pl.in mysql_install_db.pl.in In CMake, set reasonable values for 'CFLAGS', 'prefix', 'datadir' and so on. scripts/Makefile.am: Include "mysql_config.pl.in" and "mysql_install_db.pl.in" in the source TAR scripts/make_win_bin_dist: Only include explicitly listed scripts from the "scripts" directory scripts/mysql_convert_table_format.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_explain_log.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_tableinfo.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqld_multi.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqldumpslow.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysqlhotcopy.sh: Use default Perl location "#!/usr/bin/perl" instead of the build host path scripts/mysql_config.pl.in: New Perl version of Unix shell script, mainly for Windows scripts/mysql_install_db.pl.in: New Perl version of Unix shell script, mainly for Windows
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2008-01-231-2/+4
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint configure.in: Auto merged extra/resolveip.c: Auto merged include/my_sys.h: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_misc.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/func_misc.test: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_strfunc.h: Auto merged sql/item_timefunc.cc: Auto merged sql/opt_range.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged storage/myisam/ft_boolean_search.c: Auto merged storage/myisam/ha_myisam.cc: Auto merged storage/myisam/sort.c: Auto merged client/mysqlcheck.c: manual merge mysql-test/r/mysqlcheck.result: manual merge mysql-test/t/mysqlcheck.test: manual merge
| * | | Bug#27427: resolveip fails on hostnames with a leading digitunknown2008-01-231-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Patch by Kasper Dupont. No CLA required for this size of patch. "resolveip" program produces incorrect result if given a hostname starting with a digit. Someone seems to have thought that names can not have digits at the beginning. Instead, use the resolver library to work out the rules of hostnames, as it will undoubtedly be better at it than we are. configure.in: See if we need to a library for address lookups. extra/resolveip.c: Don't use silly heuristic to know whether a string is a dotted quad. Instead, pass the whole thing into the resolver and let its smarts do all the work.
* | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-10-101-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51 configure.in: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged scripts/Makefile.am: Auto merged scripts/mysql_system_tables_data.sql: Auto merged scripts/mysqld_safe.sh: Auto merged sql/sql_select.cc: Auto merged storage/innobase/handler/ha_innodb.cc: Auto merged
| * \ \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maintunknown2007-10-051-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint client/mysqldump.c: Auto merged extra/comp_err.c: Auto merged mysys/my_init.c: Auto merged
| | * | Merge pilot.mysql.com:/data/msvensson/mysql/bug27789/my50-bug27789unknown2007-10-051-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maint
| | | * | Fixed Bug #27789 "Wrong permissions of sql/share/language directories"unknown2007-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extra/comp_err.c: Override my_mkdir() umask setting. The default is 0700 which perfectly makes sense for the server but leads to Bug #27789 when applied to comp_err generated directories in the souce tree. Generated directories and the files within won't be accessible to other users, sometimes including root if on a non-local filesystem, making "sudo make install" fail.
* | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-09-261-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| * | | | Makefile.am:unknown2007-09-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always include all sub directories in "make dist" Removed incorrect comment configure.in: Unconditionally list make files in AC_CONFIG_FILES Removed 'thread_dirs', it is not used Minor cleanup compile-dist: Simplified the configure line needed for "make dist" to get it all zlib.m4, ssl.m4: Unconditionally list make files in AC_CONFIG_FILES Makefile.am: Removed DIST_SUBDIRS not needed Don't copy soft links as files into source package BUILD/compile-dist: Simplified the configure line needed for "make dist" to get it all config/ac-macros/ssl.m4: Unconditionally list make files in AC_CONFIG_FILES config/ac-macros/zlib.m4: Unconditionally list make files in AC_CONFIG_FILES libmysql/Makefile.am: Removed incorrect comment Makefile.am: Always include all sub directories in "make dist" mysql-test/Makefile.am: Removed DIST_SUBDIRS not needed libmysql_r/Makefile.am: Don't copy soft links as files into source package libmysqld/Makefile.am: Don't copy soft links as files into source package libmysqld/examples/Makefile.am: Don't copy soft links as files into source package sql/Makefile.am: Don't copy soft links as files into source package extra/Makefile.am: Always include all sub directories in "make dist" plugin/Makefile.am: Always include all sub directories in "make dist" configure.in: Unconditionally list make files in AC_CONFIG_FILES Removed 'thread_dirs', it is not used Minor cleanup
* | | | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintunknown2007-08-2815-8/+40
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint extra/yassl/include/openssl/crypto.h: Auto merged extra/yassl/include/openssl/ssl.h: Auto merged extra/yassl/include/yassl_int.hpp: Auto merged extra/yassl/src/ssl.cpp: Auto merged extra/yassl/src/yassl_int.cpp: Auto merged vio/viossl.c: Auto merged mysql-test/suite/rpl/t/rpl_ssl.test: Merge 5.0->5.1
| * | | Import yaSSL version 1.7.2unknown2007-08-2815-8/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix bug#27265 - Support for fixing bug#18441 extra/yassl/include/openssl/crypto.h: Import patch yassl.diff extra/yassl/include/openssl/ssl.h: Import patch yassl.diff extra/yassl/include/yassl_int.hpp: Import patch yassl.diff extra/yassl/src/handshake.cpp: Import patch yassl.diff extra/yassl/src/socket_wrapper.cpp: Import patch yassl.diff extra/yassl/src/ssl.cpp: Import patch yassl.diff extra/yassl/src/yassl_int.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/coding.cpp: Import patch yassl.diff extra/yassl/taocrypt/src/crypto.cpp: Import patch yassl.diff extra/yassl/include/openssl/des_old.h: Import patch yassl.diff extra/yassl/include/openssl/evp.h: Import patch yassl.diff extra/yassl/include/openssl/hmac.h: Import patch yassl.diff extra/yassl/include/openssl/objects.h: Import patch yassl.diff extra/yassl/include/openssl/sha.h: Import patch yassl.diff extra/yassl/include/openssl/prefix_ssl.h: Update prefixes
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-141-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1 configure.in: Auto merged client/mysql.cc: Auto merged include/m_ctype.h: Auto merged sql/field.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/log.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sp_head.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_lex.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged storage/myisam/mi_rkey.c: Auto merged client/mysqldump.c: Manual merge (trivial) scripts/mysql_install_db.sh: Complex merge (parital rewrite of new code) sql/sql_show.cc: Manual merge tests/mysql_client_test.c: then if ! test -x "$print_defaults" then missing_in_basedir my_print_defaults exit 1 fi else
| * | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Faster thr_alarm() Added 'Opened_files' status variable to track calls to my_open() Don't give warnings when running mysql_install_db Added option --source-install to mysql_install_db I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() BUILD/compile-solaris-sparc-forte: Updated script to current Solaris installations Now we compile by default for 64 bits client/mysql.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysql_upgrade.c: Fixed compiler warning (on Forte) client/mysqladmin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) client/mysqlcheck.c: Fixed compiler warning (on Forte) client/mysqldump.c: Fixed compiler warning (on Forte) client/mysqlslap.c: Fixed compiler warning (on Forte) client/mysqltest.c: Fixed compiler warning (on Forte) client/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ configure.in: Added detection of mtmalloc and ieeefp.h extra/replace.c: Fixed compiler warning (on Forte) include/m_ctype.h: Added some typedef's to make it easy to use C function pointers in C++ include/my_sys.h: Added my_file_total_opened (counter for calls to my_open()) include/myisam.h: Fixed compiler warning (on Forte) libmysql/libmysql.c: Fixed compiler warning (on Forte) by adding casts and change types libmysql/manager.c: Fixed compiler warning (on Forte) by adding casts and change types mysql-test/r/ctype_cp932_binlog_stm.result: Updated positions (Needed because we didn't before correctly restore collation_database after running stored procedure mysys/my_fopen.c: Count number of opened files mysys/my_open.c: Count number of opened files mysys/my_static.c: Count number of opened files mysys/thr_alarm.c: Optimization to do less alarm() and pthread_sigmask() calls. Idea is to remember time for next pending alarm and not reschedule a new alarm if it's after the current one. Before we only did this if there was other pending alarms. We don't have to use pthread_sigmask() in case of 'USE_ONE_SIGNAL_HAND' as the alarm() signal will be blocked for the calling thread anyway and no other thread will have the alarm() signal enabled to call process_alarm() regex/regcomp.c: Fixed compiler warning (on Forte) by adding casts and change types scripts/mysql_install_db.sh: Added option --source-install to allow one to create a mysql database from the source tree without installing MySQL Don't give (unnecessary) warnings server-tools/instance-manager/angel.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) server-tools/instance-manager/thread_registry.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/event_db_repository.cc: index_read() -> index_read_map() sql/event_queue.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/field.cc: Fixed compiler warnings about hidden fields sql/ha_partition.cc: Fixed compiler warnings about hidden fields index_read() -> index_read_map() sql/ha_partition.h: index_read() -> index_read_map() sql/handler.cc: Added PAGE option to row types (to prepare for future) index_read() -> index_read_map() sql/handler.h: Added ROW_TYPE_PAGE (for future) Added flag to signal if table was to be created transactionally I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems index_read() -> index_read_map() index_read_idx() -> index_read_idx_map() index_read_last() -> index_read_last_map() sql/item.cc: Fixed indentation Renamed local variable to avoid hiding class variable sql/item_cmpfunc.cc: Renamed local variable to avoid hiding class variable sql/item_cmpfunc.h: Removed not used variable sql/item_func.cc: Renamed local variable to avoid hiding class variable sql/item_strfunc.cc: Moved functions from Item_strfunc.cc sql/item_strfunc.h: Move functions to item_strfunc.cc Use C function pointer type to avoid compiler warnings (with Forte) sql/item_subselect.cc: index_read() -> index_read_map() sql/item_xmlfunc.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/key.cc: Fixed indentation sql/log.cc: Renamed local variable to avoid hiding class variable sql/log_event.cc: Removed call to my_time() when creating class instance of Log_event() as this may have static instances. (One can't call my_time() before my_init()) index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/log_event_old.cc: Renamed local variable to avoid hiding class variable sql/mysql_priv.h: Made all create_backup_ctx() declarations identical. This lifted up a bug where wrong create_backup_ctx() was called in some cases. Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/mysqld.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Fixed indentation Don't call end_thr_alarm() when calling unireg_abort() as unireg_abort() already calls end_thr_alarm() Added variable 'Opened_files' (number of calls to my_open() or my_fopen()) Don't print 'loose' warnings when using --bootstrap (to avoid warnings when running mysql_install_db) Fixed compiler warnings sql/opt_range.cc: index_read() -> index_read_map() sql/opt_sum.cc: index_read() -> index_read_map() sql/partition_info.cc: Renamed local variable to avoid hiding class variable sql/rpl_filter.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/set_var.cc: Renamed local variable to avoid hiding class variable Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/set_var.h: Added 'process_key_cache_t' type to avoid compiler warning (on Forte) sql/sp.cc: More debugging index_read() -> index_read_map() sql/sp_cache.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sp_head.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) Moved 'saved_creation_ctx' higher up to be able to free objects allocated by create_backup_ctx() sql/sql_acl.cc: index_read() -> index_read_map() sql/sql_class.cc: Renamed local variable to avoid hiding class variable Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_class.h: Renamed local variable to avoid hiding class variable sql/sql_db.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) sql/sql_delete.cc: Renamed local variable to avoid hiding class variable sql/sql_handler.cc: index_read() -> index_read_map() sql/sql_help.cc: index_read() -> index_read_map() sql/sql_insert.cc: index_read() -> index_read_map() Renamed local variable to avoid hiding class variable sql/sql_lex.cc: Renamed local variable to avoid hiding class variable sql/sql_plugin.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) index_read() -> index_read_map() Don't give warnings about not used plugins if we are using --warnings=0 sql/sql_select.cc: index_read() -> index_read_map() sql-common/client.c: Fixed compiler warning (on Forte) sql-common/my_time.c: Removed never accessed code Fixed compiler warning (on Forte) sql/sql_servers.cc: index_read() -> index_read_map() sql/sql_show.cc: Added TRANSACTIONAL to SHOW CREATE Fixed ROW_TYPE_PAGE sql/sql_string.cc: Avoid compiler warnings when using C function pointers in C++ sql/sql_table.cc: Set create_info->transactional if we used TRANSACTIONAL=1 sql/sql_udf.cc: index_read() -> index_read_map() sql/sql_yacc.yy: Added TRANSACTIONAL=0|1 to CREATE (for future) Added row type PAGE (was only partionally handled before) sql/strfunc.cc: Avoid compiler warnings when using C function pointers in C++ sql/table.cc: More DBUG statements Declare all create_backup_ctx() functions identically Remember if table was created with TRANSACTIONAL flag or not (future safe) Renamed local variable to avoid hiding class variable sql/table.h: Remember if table was created with TRANSACTIONAL=1 sql/tztime.cc: index_read() -> index_read_map() sql-common/pack.c: Fixed compiler warning (on Forte) storage/archive/archive_reader.c: Fixed compiler warning (on Forte) storage/archive/azio.c: Fixed compiler warning (on Forte) storage/blackhole/ha_blackhole.cc: index_read() -> index_read_map() storage/blackhole/ha_blackhole.h: index_read() -> index_read_map() storage/csv/ha_tina.cc: Declare functions sent to C code with extern "C" to avoid compiler warnings (on Forte) storage/example/ha_example.cc: index_read() -> index_read_map() storage/example/ha_example.h: index_read() -> index_read_map() storage/heap/ha_heap.cc: index_read() -> index_read_map() storage/heap/ha_heap.h: index_read() -> index_read_map() storage/heap/hp_test1.c: Fixed compiler warning (on Forte) storage/heap/hp_test2.c: Fixed compiler warning (on Forte) storage/myisam/ft_boolean_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_nlq_search.c: Fixed compiler warning (on Forte) storage/myisam/ft_parser.c: Fixed compiler warning (on Forte) storage/myisam/ft_stopwords.c: Fixed compiler warning (on Forte) storage/myisam/ha_myisam.cc: index_read() -> index_read_map() storage/myisam/ha_myisam.h: index_read() -> index_read_map() storage/myisam/mi_check.c: Fixed compiler warning (on Forte) storage/myisam/mi_delete.c: Fixed compiler warning (on Forte) storage/myisam/mi_dynrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_extra.c: Fixed compiler warning (on Forte) storage/myisam/mi_key.c: Fixed compiler warning (on Forte) storage/myisam/mi_keycache.c: Fixed compiler warning (on Forte) storage/myisam/mi_locking.c: Fixed compiler warning (on Forte) storage/myisam/mi_log.c: Fixed compiler warning (on Forte) storage/myisam/mi_open.c: Fixed compiler warning (on Forte) storage/myisam/mi_packrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_page.c: Fixed compiler warning (on Forte) storage/myisam/mi_rkey.c: Added comment storage/myisam/mi_search.c: Fixed compiler warning (on Forte) storage/myisam/mi_statrec.c: Fixed compiler warning (on Forte) storage/myisam/mi_test1.c: Fixed compiler warning (on Forte) storage/myisam/mi_test2.c: Fixed compiler warning (on Forte) storage/myisam/mi_test3.c: Fixed compiler warning (on Forte) storage/myisam/mi_update.c: Fixed compiler warning (on Forte) storage/myisam/mi_write.c: Fixed compiler warning (on Forte) storage/myisam/myisamdef.h: Fixed that file_read/file_write returns type size_t Changed some functions to use uchar * as argument/return value instead of char* This fixed some compiler warnings on Forte storage/myisam/myisamlog.c: Fixed compiler warning (on Forte) storage/myisam/myisampack.c: Fixed compiler warning (on Forte) storage/myisam/rt_test.c: Fixed compiler warning (on Forte) storage/myisam/sort.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisam/sp_test.c: Fixed compiler warning (on Forte) by adding casts or changing variables to uchar* storage/myisammrg/ha_myisammrg.cc: index_read() -> index_read_map() storage/myisammrg/ha_myisammrg.h: index_read() -> index_read_map() storage/myisammrg/myrg_create.c: Fixed compiler warning (on Forte) by adding casts or changing variable types storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Tdummy -> align (as in other part of cluster code) storage/ndb/src/kernel/vm/DynArr256.cpp: Removed not used variable storage/ndb/src/ndbapi/Ndb.cpp: Removed not used variable strings/strtod.c: Include ieeefp.h to avoid compiler warning tests/bug25714.c: Fixed compiler warning tests/mysql_client_test.c: Remove not used variable Fixed indentation Removed never reached code Fixed compiler warning (on Forte) by adding casts or changing variable types vio/viosocket.c: Fixed compiler warning (on Forte) by adding casts or changing variable types
* | | | | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newunknown2007-08-033-9/+19
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new BitKeeper/deleted/.del-README~1: SCCS merged BitKeeper/deleted/.del-configure.js: ul dbug/CMakeLists.txt: SCCS merged extra/CMakeLists.txt: SCCS merged extra/yassl/CMakeLists.txt: SCCS merged extra/yassl/taocrypt/CMakeLists.txt: SCCS merged scripts/CMakeLists.txt: SCCS merged server-tools/instance-manager/CMakeLists.txt: SCCS merged sql/CMakeLists.txt: SCCS merged storage/myisam/CMakeLists.txt: SCCS merged
| * | | | CMakeLists.txt, README, configure.jsunknown2007-08-033-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several adjustments to make client libraries pass the link test on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118) win/README: - Removed references to PARTITION engine, 5.1 only win/configure.js: - Removed references to PARTITION engine, 5.1 only extra/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". myisam/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". scripts/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". server-tools/instance-manager/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". sql/CMakeLists.txt: Use the special 'debug' list element to mark that "dbug" library is only to be linked against if build type "Debug". mysys/CMakeLists.txt: Restored include path to "mysys" itself dbug/CMakeLists.txt: Changed to optionally be included to give a file list only extra/yassl/CMakeLists.txt: Changed to optionally be included to give a file list only extra/yassl/taocrypt/CMakeLists.txt: Changed to optionally be included to give a file list only zlib/CMakeLists.txt: Changed to optionally be included to give a file list only libmysql/CMakeLists.txt: For compatibility with Visual Studio 2005, list all files that are to be part of the library build, i.e. libraries can't be built from other libraries. Set SOURCE_SUBLIBS and include the file listings from "zlib", "dbug", "taocrypt" and "yassl"
* | | | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.unknown2007-07-313-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They had been introduced in 5.1 and were only later backported to 5.0; as a consequence, the files in the 5.1 tree do not depend on the 5.0 ones, and changes in 5.0 do not propagate into the 5.1 files. To fix this, the (previous) files in 5.1 now are deleted ("bk rm"), and the previously deleted files depending on 5.0 are now moved to the respective source directories ("bk mv"). The current 5.1 contents is restored in these files. If you need the previous history of the 5.1 files ("bk revtool"), access those in "BitKeeper/deleted". Contrary to the original plan, I did not introduce the name "CMakeLists.historic" - mostly in order not to clutter the source tree. This fixes bug#29982. BitKeeper/deleted/.del-CMakeLists.txt~2eb9019b: Delete: client/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~5b8836e4: Delete: CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~93f0d646: Delete: dbug/CMakeLists.txt dbug/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~9 -> dbug/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~57492bba: Delete: extra/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~8c35983c: Delete: extra/yassl/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~c3563d5f: Delete: extra/yassl/taocrypt/CMakeLists.txt extra/yassl/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~11 -> extra/yassl/CMakeLists.txt extra/yassl/taocrypt/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~12 -> extra/yassl/taocrypt/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~99a50df6: Delete: libmysql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~86a68ea1: Delete: mysys/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~9e206e11: Delete: regex/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~95969b72: Delete: server-tools/instance-manager/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fdec1f01: Delete: sql/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~1960eb07: Delete: storage/innobase/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~96726c3b: Delete: storage/myisam/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~bb293bb4: Delete: storage/heap/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~5fa65a12: Delete: strings/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fb3a3a47: Delete: storage/myisammrg/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~fc201a06: Delete: tests/CMakeLists.txt tests/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~5 -> tests/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~2a609d33: Delete: vio/CMakeLists.txt vio/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~6 -> vio/CMakeLists.txt BitKeeper/deleted/.del-CMakeLists.txt~ef945345: Delete: zlib/CMakeLists.txt zlib/CMakeLists.txt: Rename: BitKeeper/deleted/.del-CMakeLists.txt~8 -> zlib/CMakeLists.txt CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". client/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". extra/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". libmysql/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". mysys/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". regex/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". server-tools/instance-manager/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". sql/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/heap/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/innobase/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/myisam/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". storage/myisammrg/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted". strings/CMakeLists.txt: Restore the current 5.1 contents into the 5.0-dependent file. For the previous 5.1 history of this file, see the one in "BitKeeper/deleted".
* | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50unknown2007-07-191-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | | | | | | | | | into damien-katzs-computer.local:/Users/dkatz/mysql51 sql/mysql_priv.h: Auto merged
| * | | Bug #29784 YaSSL assertion failure when reading 8k key.unknown2007-07-171-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed the yassl base64 decoding to correctly allocate a maximum decoded buffer size. mysql-test/std_data/server8k-cert.pem: BitKeeper file /Users/dkatz/50/mysql-test/std_data/server8k-cert.pem mysql-test/std_data/server8k-key.pem: BitKeeper file /Users/dkatz/50/mysql-test/std_data/server8k-key.pem extra/yassl/taocrypt/src/coding.cpp: Fixed buffer allocation to compute the proper maximum decoded size: (EncodedLength * 3/4) + 3 mysql-test/r/ssl_8k_key.result: New BitKeeper file ``mysql-test/r/ssl_8k_key.result'' Test connection to server using large SSL key. mysql-test/t/ssl_8k_key.test: New BitKeeper file ``mysql-test/t/ssl_8k_key.test'' Test connection to server using large SSL key.
View Lorry Controller Status