summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* 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].
* 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.
* 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
| * 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.
| | * | 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.
* | | | 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.
| * | fixes for warnings and compile errors for the fix of bug 26243gkodinov/kgeorge@macbook.gmz2008-03-291-0/+2
| |/
* | perror.c:gkodinov/kgeorge@magare.gmz2008-03-281-0/+1
| | | | | | | | fixed warning in 5.1-marvel in fix for bug 25177
* | Fixed problem with non-synchronous error listsgkodinov/kgeorge@magare.gmz2008-03-281-49/+30
| | | | | | | | | | | | in perror and handler descriptors (BUG#25177) Fixed problem of masking mysql error by system error in perror (BUG#23028)
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildiggy@alf.(none)2008-02-211-0/+1
|\ \ | | | | | | | | | into alf.(none):/src/mysql-5.1-build_31929
| * | Bug#31929 Windows build fails with >=4 Parallel build threads.iggy@alf.(none)2008-01-291-0/+1
| | | | | | | | | | | | | | | - Add GenError Dependency to storage engines that include mysqld_error.h
* | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-buildguilhem@gbichot4.local2008-02-181-1/+1
|\ \ \ | | | | | | | | | | | | into gbichot4.local:/home/mysql_src/mysql-5.1-build-gca
| * | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>guilhem@gbichot4.local2008-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).
* | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2008-02-131-0/+8
|\ \ \ \ | | |_|/ | |/| | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| * | | Make this build on Windows.df@pippilotta.erinye.com2008-02-111-0/+8
| | | |
| * | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2008-01-285-7/+27
| |\ \ \ | | | | | | | | | | | | | | | into trift2.:/MySQL/M50/push-5.0
* | \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-01-285-7/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2008-01-233-1/+16
| |\ \ \ \ | | | |/ / | | |/| | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
| | * | | Merge dev:/data0/mysqldev/my/build-200801111340-5.0.54a/mysql-5.0-releasedf@pippilotta.erinye.com2008-01-233-1/+16
| | |\ \ \ | | | | | | | | | | | | | | | | | | into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
| | | * \ \ Merge mysql.com:/data0/mysqldev/my/mysql-5.0-releaseserg/mysqldev@janus.mylan/production.mysql.com2008-01-113-1/+16
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/data0/mysqldev/users/serg/mysql-5.0-release
| | | | * | | Bug#33814 - yassl problemsserg/mysqldev@janus.mylan/production.mysql.com2008-01-113-1/+16
| | | | | | |
| * | | | | | Merge mysql.com:/home/kent/bk/windows-cleanup/mysql-5.0-buildkent@kent-amd64.(none)2007-12-282-6/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | | into mysql.com:/home/kent/bk/windows-cleanup/mysql-5.1-build
| | * | | | make_win_bin_dist CMakeLists.txt resolveip.c Makefile.am:kent@mysql.com/kent-amd64.(none)2007-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
* | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintcmiller@zippy.cornsilk.net2008-01-231-2/+4
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
| * | | Bug#27427: resolveip fails on hostnames with a leading digitcmiller@zippy.cornsilk.net2008-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.
* | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51tsmith@ramayana.hindu.god2007-10-101-0/+1
|\ \ \ | | | | | | | | | | | | into ramayana.hindu.god:/home/tsmith/m/bk/maint/51
| * \ \ Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.mysql.com2007-10-051-0/+1
| |\ \ \ | | |/ / | | | | | | | | into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
| | * | Merge pilot.mysql.com:/data/msvensson/mysql/bug27789/my50-bug27789msvensson@pilot.mysql.com2007-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"msvensson@pilot.mysql.com2007-10-051-0/+1
| | | | |
* | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-buildkent@kent-amd64.(none)2007-09-261-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | into mysql.com:/home/kent/bk/make-dist-stable/mysql-5.1-build
| * | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2007-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
* | | | | Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maintmsvensson@pilot.(none)2007-08-2815-8/+40
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / into pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
| * | | Import yaSSL version 1.7.2msvensson@pilot.(none)2007-08-2815-8/+40
| | | | | | | | | | | | | | | | | | | | - Fix bug#27265 - Support for fixing bug#18441
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2007-08-141-4/+5
|\ \ \ \ | | | | | | | | | | | | | | | into mysql.com:/home/my/mysql-5.1
| * | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarismonty@mysql.com/nosik.monty.fi2007-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()
* | | | | Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build-newkent@kent-amd64.(none)2007-08-033-9/+19
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build-new
| * | | | CMakeLists.txt, README, configure.jskent@mysql.com/kent-amd64.(none)2007-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)
* | | | | Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.joerg@trift2.2007-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.
* | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql50dkatz@damien-katzs-computer.local2007-07-191-1/+1
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | into damien-katzs-computer.local:/Users/dkatz/mysql51
| * | | Bug #29784 YaSSL assertion failure when reading 8k key.dkatz@damien-katzs-computer.local2007-07-171-1/+1
| | |/ | |/| | | | | | | Fixed the yassl base64 decoding to correctly allocate a maximum decoded buffer size.
* | | Merge damien-katzs-computer.local:/Users/dkatz/50dkatz@damien-katzs-computer.local2007-07-132-2/+2
|\ \ \ | |/ / | | | | | | into damien-katzs-computer.local:/Users/dkatz/mysql51
| * | Minor fixes for test failures and compiler warnings for Bug #29579.dkatz@damien-katzs-computer.local2007-07-132-2/+2
| | |
View Lorry Controller Status