Commit graph

605 commits

Author SHA1 Message Date
Davi Arnaut
6f3a540c37 Bug#42733: Type-punning warnings when compiling MySQL --
strict aliasing violations.

Essentially, the problem is that large parts of the server were
developed in simpler times (last decades, pre C99 standard) when
strict aliasing and compilers supporting such optimizations were
rare to non-existent. Thus, when compiling the server with a modern
compiler that uses strict aliasing rules to perform optimizations,
there are several places in the code that might trigger undefined
behavior.

As evinced by some recent bugs, GCC does a somewhat good of job
misoptimizing such code, but on the other hand also gives warnings
about suspicious code. One problem is that the warnings aren't
always accurate, yet we can't afford to just shut them off as we
might miss real cases. False-positive cases are aggravated mostly
by casts that are likely to trigger undefined behavior.

The solution is to start a cleanup process focused on fixing and
reducing the amount of strict-aliasing related warnings produced
by GCC and others compilers. A good deal of noise reduction can
be achieved by just removing useless casts that are product of
historical cruft and are likely to trigger undefined behavior if
dereferenced.

client/mysql.cc:
  Remove now-unnecessary casts.
  Break up large strings.
client/mysql_upgrade.c:
  Remove now-unnecessary casts.
client/mysqladmin.cc:
  Remove now-unnecessary casts.
  Break up large strings.
client/mysqlbinlog.cc:
  Remove now-unnecessary casts.
client/mysqlcheck.c:
  Remove now-unnecessary casts.
client/mysqldump.c:
  Remove now-unnecessary casts.
client/mysqlimport.c:
  Remove now-unnecessary casts.
client/mysqlshow.c:
  Remove now-unnecessary casts.
client/mysqlslap.c:
  Remove now-unnecessary casts.
client/mysqltest.cc:
  Remove now-unnecessary casts.
extra/comp_err.c:
  Remove now-unnecessary casts.
extra/my_print_defaults.c:
  Remove now-unnecessary casts.
  Break up large strings.
extra/mysql_waitpid.c:
  Remove now-unnecessary casts.
extra/perror.c:
  Remove now-unnecessary casts.
extra/resolve_stack_dump.c:
  Remove now-unnecessary casts.
extra/resolveip.c:
  Remove now-unnecessary casts.
include/my_getopt.h:
  Use a void pointer type as the opaque type to avoid problems with type
  incompatibility -- GCC issues warnings when the type name is not type
  compatible with a operand. As a side bonus, a explicit cast won't be
  necessary anymore.
include/sslopt-longopts.h:
  Remove now-unnecessary casts.
  Break up large strings.
mysys/my_getopt.c:
  Update opaque type and introduce a type definition for the
  argument to my_getopt_register_get_addr.
server-tools/instance-manager/options.cc:
  Remove now-unnecessary casts.
sql/mysqld.cc:
  Remove now-unnecessary casts.
  Break up large strings.
  Update mysql_getopt_value prototype (the old prototype
  was different from the definition anyway).
sql/sql_plugin.cc:
  The type of a pointer to a function must be compatible with the
  pointed-to function type, otherwise the behavior is undefined.
sql/table.cc:
  The variable buf pointer to pointer to pointer to constant char
  could improperly alias a incompatible type in call to fix_type_
  pointers. Since this was actually dead code, it is simply removed.
sql/unireg.cc:
  Remove call to get_form_pos. The code creates a new FRM file which
  is always truncated and writes the form position as 0. Hence, no
  need to retrieve it, we now for sure it is 0.
storage/archive/archive_reader.c:
  Remove now-unnecessary casts.
storage/myisam/ft_nlq_search.c:
  Read weight directly from the buffer.
storage/myisam/fulltext.h:
  Add explanation about the type duality of a key buffer.
  Add accessor macro to retrieve a FT float value.
storage/myisam/mi_test1.c:
  Remove now-unnecessary casts.
storage/myisam/myisam_ftdump.c:
  Read weight directly from the buffer.
storage/myisam/myisamchk.c:
  Remove now-unnecessary casts.
storage/myisam/myisamlog.c:
  A pointer to char was used to alias a pointer to pointer to
  unsigned char, thus violating strict aliasing rules.
storage/myisam/myisampack.c:
  Remove now-unnecessary casts.
strings/decimal.c:
  Remove aliasing violation, printing the value is enough for
  debugging purposes.
tests/mysql_client_test.c:
  Remove now-unnecessary casts.
2010-06-10 17:16:43 -03:00
Davi Arnaut
34ceaa6a3d Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. 2010-06-09 21:36:20 -03:00
Davi Arnaut
41297909ad Bug#34236: Various possibly related SSL crashes
Addendum: Work around a compilation failure on Windows due to
          windows.h not being added to the global namespace.

extra/yassl/include/lock.hpp:
  Move windows.h inclusion into the global namespace.
2010-06-09 21:30:41 -03:00
Davi Arnaut
75a18e24fa Merge of mysql-5.0-bugteam into mysql-5.1-bugteam.
config/ac-macros/ssl.m4:
  Enable yaSSL thread safety if linking with the server or a
  thread safe client library. Avoids building a thread safe
  yaSSL when only building a non-thread safe client library.
2010-06-08 18:14:18 -03:00
Davi Arnaut
e3d9ac5262 Bug#34236: Various possibly related SSL crashes
The problem was that the bundled yaSSL library was being built
without thread safety support regardless of the thread safeness
of the compoments linked with it.

The solution is to enable yaSSL thread safety support if any
component (server or client) is to be built with thread support.

Also, generate new certificates for yaSSL's test suite.

config/ac-macros/yassl.m4:
  Enable yaSSL thread safety if linking with the server or a
  thread safe client library. Avoids building a thread safe
  yaSSL when only building a non-thread safe client library.
extra/yassl/CMakeLists.txt:
  Always enable for Windows builds.
extra/yassl/certs/ca-cert.pem:
  New certificate, previous one expired.
extra/yassl/certs/client-cert.der:
  New certificate, previous one expired.
extra/yassl/certs/client-cert.pem:
  New certificate, previous one expired.
extra/yassl/certs/dsa-cert.pem:
  New certificate, previous one expired.
extra/yassl/certs/server-cert.pem:
  New certificate, previous one expired.
extra/yassl/include/lock.hpp:
  Rename MULTI_THREAD to YASSL_THREAD_SAFE.
extra/yassl/src/Makefile.am:
  Use CXXFLAGS to set thread related definitions as the lock header
  (lock.hpp) has no local dependencies.
extra/yassl/src/lock.cpp:
  Rename MULTI_THREAD to YASSL_THREAD_SAFE.
extra/yassl/taocrypt/CMakeLists.txt:
  Always enable for Windows builds.
extra/yassl/taocrypt/benchmark/Makefile.am:
  Pass thread related CXXFLAGS.
extra/yassl/taocrypt/src/Makefile.am:
  Pass thread related CXXFLAGS.
extra/yassl/taocrypt/test/Makefile.am:
  Pass thread related CXXFLAGS.
extra/yassl/taocrypt/test/memory.cpp:
  Rename MULTI_THREAD to YASSL_THREAD_SAFE.
extra/yassl/testsuite/Makefile.am:
  Pass thread related CXXFLAGS.
2010-06-08 10:36:47 -03:00
Staale Smedseng
57a4084884 Bug #43414 Parenthesis (and other) warnings compiling
MySQL with gcc 4.3.2
      
This is the final patch in the context of this bug. 

cmd-line-utils/readline/rlmbutil.h:
  Changed in a previous patch, reverted by a backport.
cmd-line-utils/readline/text.c:
  Static var initialization.
extra/yassl/include/yassl_error.hpp:
  SetErrorString handles errors outside of the YasslError
  enum.
extra/yassl/src/ssl.cpp:
  SetErrorString handles errors outside of the YasslError
  enum.
extra/yassl/src/yassl_error.cpp:
  SetErrorString handles errors outside of the YasslError
  enum.
2010-02-22 14:23:47 +01:00
Ramil Kalimullin
495810cd1f Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL
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.
2010-01-13 09:20:45 +04:00
Ramil Kalimullin
08dfd4ad0c Auto-merge. 2010-01-13 15:04:59 +04:00
Georgi Kodinov
a889a83395 merge 2009-11-20 12:11:31 +02:00
Georgi Kodinov
ed9e3409e4 Bug#48864: MySQL fails to compile on 64 bit Fedora 12
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.
2009-11-18 17:24:10 +02:00
Magnus Blåudd
6ff8f716c3 Bug#47867 compiler warning _WIN32_WINNT macro redefinition
- Remove the conflicting macro definitions since we define a higher value
   directly in the cmake files.
2009-10-06 18:10:34 +02:00
Staale Smedseng
6a89842e36 Bug #43414 Parenthesis (and other) warnings compiling MySQL
with gcc 4.3.2

Cleaning up warnings not present in 5.0.
2009-09-23 15:21:29 +02:00
Satya B
342553252f Fix for BUG#18828 - If InnoDB runs out of undo slots,
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
2009-07-17 14:13:53 +05:30
Staale Smedseng
300a8721fa Merge from 5.0 2009-06-29 16:00:47 +02:00
Staale Smedseng
6777150883 Merge from 5.0-bt 2009-06-29 15:17:01 +02:00
Jim Winstead
84c5ba6ece Fix incorrect filename in verbose output of innochecksum. (Bug #44484,
patch contributed by Andrew Hutchings)
2009-05-05 11:07:26 -07:00
Jim Winstead
46154071c4 Make help text for perror more accurate. (Bug #34574) 2009-04-28 11:16:44 -07:00
Ignacio Galarza
675c3ce2bb auto-merge 2009-03-19 09:44:58 -04:00
Chad MILLER
00aa5ad58a Bug#39370: wrong output for error code 153
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.
2009-02-24 12:05:37 +02:00
Ignacio Galarza
5b7347bda3 Bug#29125 Windows Server X64: so many compiler warnings
- 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
2009-02-13 11:41:47 -05:00
Ignacio Galarza
54fbbf9591 Bug#29125 Windows Server X64: so many compiler warnings
- 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
2009-02-10 17:47:54 -05:00
Davi Arnaut
b4c40ac240 Bug#41612: resolve_stack_dump does not decode 5.1 stack trace
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.
2008-12-19 08:47:28 -02:00
Chad MILLER
482fa1f174 Replace C++ comment in a header file. Thanks, Alik! 2008-12-08 12:45:48 -05:00
Georgi Kodinov
bd53e304d7 Addendum to the fix for bug #39178: Server crash in YaSSL
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
2008-12-02 13:15:28 +02:00
Sergey Glukhov
910d41725d 5.0-bugteam->5.1-bugteam merge 2008-11-27 17:05:38 +04:00
Sergey Glukhov
fbbdb613d7 Bug#34825 perror on windows doesn't know about win32 error codes
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
2008-11-27 16:33:40 +04:00
Chad MILLER
490bc42101 Update to change for bug 39178. Revert error-handling change, perhaps
temporarily if yassl maintainer has plans for other error handling.
2008-11-20 09:51:01 -05:00
Chad MILLER
480046c52e Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \
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.)
2008-11-18 11:45:44 -05:00
Timothy Smith
31a620089a Auto merge 5.1-build -> 5.1-bugteam 2008-09-10 19:35:11 -06:00
Timothy Smith
cafa5594d3 Auto merge 5.0-build -> 5.0-bugteam 2008-09-10 19:34:17 -06:00
Vladislav Vaintroub
58f0b3185a Fix "make dist" error - remove Visual Studio project files from
distribution
2008-09-01 17:27:14 -04:00
Vladislav Vaintroub
60ef785ec6 merge 2008-09-01 11:48:21 +02:00
Joerg Bruehe
4120228e12 Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
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.
2008-08-27 16:03:39 +02:00
Joerg Bruehe
7077649ef1 Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM build
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.
2008-08-25 21:07:41 +02:00
Vladislav Vaintroub
49bd2c865a Bug #33907 : Errors compiling mysql with Microsoft Visual C++ Express 2008
- 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
2008-08-21 19:11:17 +02:00
unknown
8ae5aa3bd8 fixes for warnings and compile errors for the fix of bug 26243 2008-03-29 16:12:23 +02:00
unknown
f5f7a59ff8 perror.c:
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
2008-03-28 21:59:20 +02:00
unknown
d5a6fa7e8c Fixed problem with non-synchronous error lists
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''
2008-03-28 18:45:03 +02:00
unknown
a7341383ef Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  alf.(none):/src/mysql-5.1-build_31929


sql/CMakeLists.txt:
  Auto merged
storage/myisam/CMakeLists.txt:
  Auto merged
2008-02-21 19:53:37 -05:00
unknown
ae25da10a3 Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-build
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
2008-02-18 23:36:57 +01:00
unknown
85213f6235 Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>
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
2008-02-18 23:29:39 +01:00
unknown
e08c867e73 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build


extra/resolveip.c:
  Auto merged
2008-02-13 14:44:56 +01:00
unknown
9896475935 Make this build on Windows.
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.
2008-02-11 18:02:37 +01:00
unknown
e524e0f146 Bug#31929 Windows build fails with >=4 Parallel build threads.
- 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.
2008-01-29 21:58:57 -05:00
unknown
69338e08c0 Merge trift2.:/MySQL/M51/mysql-5.1
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
2008-01-28 15:16:40 +01:00
unknown
81ac291104 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
extra/resolveip.c:
  Auto merged
2008-01-28 15:05:33 +01:00
unknown
63a454d4f4 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
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
2008-01-23 11:53:06 -05:00
unknown
349c2acc21 Bug#27427: resolveip fails on hostnames with a leading digit
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.
2008-01-23 11:34:08 -05:00
unknown
5f5c2ab297 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
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
2008-01-23 17:12:07 +01:00
unknown
5714df7cbc Merge dev:/data0/mysqldev/my/build-200801111340-5.0.54a/mysql-5.0-release
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build


configure.in:
  merge fix
2008-01-23 17:03:59 +01:00