summaryrefslogtreecommitdiff
path: root/extra
Commit message (Collapse)AuthorAgeFilesLines
* Auto-merge.Ramil Kalimullin2010-01-132-55/+69
|\
| * Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSLRamil Kalimullin2010-01-132-55/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem: copying issuer's (or subject's) name tags into an internal buffer from incoming stream we didn't check the buffer overflow. That may lead to memory overrun, crash etc. Fix: ensure we don't overrun the buffer. Note: there's no simple test case (exploit needed). extra/yassl/taocrypt/include/asn.hpp: Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL - CertDecoder::AddTag() introduced. extra/yassl/taocrypt/src/asn.cpp: Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL - copying data from incoming stream to the issuer_ or subject_ buffers ensure we don't overrun them. - code cleanup.
* | mergeGeorgi Kodinov2009-11-201-5/+7
|\ \ | |/
| * Bug#48864: MySQL fails to compile on 64 bit Fedora 12Georgi Kodinov2009-11-181-5/+7
| | | | | | | | | | | | | | | | Fixed 2 errors in comp_err executable : 1. Wrong (off by 1) length passed to my_checksum() 2. strmov() was used on overlapping strings. This is not legal according to the docs in stpcpy(). Used the overlap safe memmove() instead.
| * Fix for BUG#18828 - If InnoDB runs out of undo slots, Satya B2009-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it returns misleading 'table is full' Innodb returns a misleading error message "table is full" when the number of active concurrent transactions is greater than 1024. Fixed by adding errorcode "ER_TOO_MANY_CONCURRENT_TRXS" to the error codes. Innodb should return HA_TOO_MANY_CONCURRENT_TRXS to mysql which is then mapped to ER_TOO_MANY_CONCURRENT_TRXS Note: testcase is not written as this was reproducible only by changing innodb code. extra/perror.c: Add error number and message for HA_ERR_TOO_MANY_CONCURRENT_TRXS include/my_base.h: Add error number and message for HA_ERR_TOO_MANY_CONCURRENT_TRXS sql/ha_innodb.cc: Return HA_ERR_TOO_MANY_CONCURRENT_TRXS to mysql server sql/handler.cc: Add error number and message for HA_ERR_TOO_MANY_CONCURRENT_TRXS sql/share/errmsg.txt: Add error message for ER_TOO_MANY_CONCURRENT_TRXS
* | Bug#47867 compiler warning _WIN32_WINNT macro redefinitionMagnus Blåudd2009-10-061-1/+0
| | | | | | | | | | - Remove the conflicting macro definitions since we define a higher value directly in the cmake files.
* | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-232-2/+2
| | | | | | | | | | | | | | with gcc 4.3.2 Cleaning up warnings not present in 5.0.
* | Merge from 5.0Staale Smedseng2009-06-294-1/+15
|\ \ | |/
| * Merge from 5.0-btStaale Smedseng2009-06-294-1/+15
| |
| * auto-mergeIgnacio Galarza2009-03-191-0/+11
| |\
| | * Bug#39370: wrong output for error code 153Chad MILLER2009-02-241-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add all HA error numbers and descriptions to perror. Add reminder to header. This is already fixed in smarter ways in future codebases, and this codebase is unlikely to change, since new development is forbidden here.
* | | Fix incorrect filename in verbose output of innochecksum. (Bug #44484,Jim Winstead2009-05-051-1/+1
| | | | | | | | | | | | | | | patch contributed by Andrew Hutchings)
* | | Make help text for perror more accurate. (Bug #34574)Jim Winstead2009-04-281-1/+1
| | |
* | | 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
View Lorry Controller Status