Commit graph

1449 commits

Author SHA1 Message Date
Georgi Kodinov
9daa56fd5c merged 5.0-bugteam to 5.1-bugteam 2008-09-10 12:55:38 +03:00
Narayanan V
860f74a8c1 updating server version number
configure.in:
  change server version number to 5.1.29
2008-09-05 20:20:26 +05:30
Narayanan V
06ec4b2d2e merging mysql-5.1->mysql-5.1-sea 2008-09-04 17:23:16 +05:30
unknown
d70d171cee Raise version number after cloning 5.1.28-rc 2008-08-28 16:51:00 +02:00
Joerg Bruehe
182b238334 Correct the version number to 5.0.70.
configure.in:
  Version number raise was incomplete, the 5.0 tree steps by 2.
2008-08-13 12:34:35 +02:00
unknown
6cab759d7a Raise version number after cloning 5.0.68 2008-08-13 11:05:24 +02:00
Narayanan V
b728b83536 WL#4380
Added a comment to the abi_check related
part of configure.in

configure.in:
  Added a comment to the abi_check related
  part of configure.in
2008-08-11 16:55:09 +05:30
Narayanan V
bd441c4d60 WL#4380
1) Disabled abi_check rule for all compilers except gcc
2) restored the -dI option to retain the header information.

Makefile.am:
  1) changed all-local to depend on a configure variable
     that will be set based on if the compiler is gcc.
  2) restored the -dI option removed earlier since now
     only gcc is being used.
configure.in:
  Added a check to see if gcc is being used. If it is being
  used set the ABI_CHECK variable to the abi_check target.
include/mysql.h.pp:
  The .pp file is changed to correspond to the option
  -dI.
2008-08-08 14:30:05 +05:30
Narayanan V
e3e2331cdd merging mysql-5.1 -> mysql-5.1-sea 2008-07-31 16:59:41 +05:30
Chad MILLER
f6f6d81b82 Make community features (including profiling) on by default. 2008-07-24 13:43:14 -04:00
Thava Alagu
76d7670221 WL#4380
Merging changes from 5.1 main tree to 5.1-sea team tree.
2008-07-09 19:04:22 +05:30
Joerg Bruehe
6ef962a62e Merge from main 5.0 to 5.0-build. 2008-07-09 13:17:53 +02:00
unknown
55ab1ef695 Raise version number after cloning 5.0.66 2008-07-09 08:23:30 +02:00
Daniel Fischer
0257708437 ild can not be expected on all matching installs 2008-07-05 09:44:10 +02:00
Joerg Bruehe
3f0fc6ec9b We may need 5.1.27 for selected pushes, so reserve the number. 2008-06-30 12:54:18 +02:00
Gleb Shchepa
696c03e47c auto merge 5.1-main --> 5.1-bugteam 2008-06-25 14:44:55 +05:00
Joerg Bruehe
8152b54291 Correct the version number, after cloning 5.1.26 the next one is 27 2008-06-20 19:06:03 +02:00
Joerg Bruehe
69860e7e35 Raise version number after cloning 5.1.26 2008-06-20 14:54:48 +02:00
Davi Arnaut
fcaaee6317 Bug#37003 Tests sporadically crashes with embedded server
Another problem is that the backtrace facility wasn't being
enabled for non-Linux targets even if the target OS has the
backtrace functions. Also, the stacktrace functions inside
mysqltest were being used without proper checks for their
presence in the build.


client/mysqltest.c:
  Only use stacktrace functions if they are available.
configure.in:
  Check if the compiler defines __bss_start
include/my_stacktrace.h:
  Enable stacktrace if system has backtrace functions.
mysys/stacktrace.c:
  Use backtrace functions if the system supports it.
sql/mysqld.cc:
  Only use stacktrace functions if they are available.
2008-06-19 11:02:32 -03:00
Davi Arnaut
fb8f32d077 Bug#37003 Tests sporadically crashes with embedded server
The problem was that when a embedded linked version of mysqltest
crashed there was no way to obtain a stack trace if no core file
is available. Another problem is that the embedded version of
libmysql was not behaving (crash) the same as the non-embedded with
respect to sending commands to a explicitly closed connection.

The solution is to generate a mysqltest's stack trace on crash
and to enable "reconnect" if the connection handle was explicitly
closed so the behavior matches the non-embedded one.

client/CMakeLists.txt:
  Link mysys to mysqltest.
client/Makefile.am:
  Link mysys to mysqltest.
client/mysqltest.c:
  Add fatal signal handling with backtracing for Unix and Windows.
configure.in:
  Add check for weak symbols support and remove a spurious word.
include/Makefile.am:
  Add new header with prototype for stack tracing functions.
include/my_stacktrace.h:
  Add new header with prototype for stack tracing functions.
libmysqld/CMakeLists.txt:
  stack tracing is now part of mysys.
libmysqld/Makefile.am:
  stack tracing is now part of mysys.
libmysqld/lib_sql.cc:
  Re-connect if connection was explicitly closed. This is
  done to match the behavior of the non-embeded libmysql.
mysql-test/t/sql_low_priority_updates_func.test:
  Test expects parallelism between queries that cannot be
  guaranteed under embedded.
mysys/CMakeLists.txt:
  Add stacktrace to mysys.
mysys/Makefile.am:
  Add stacktrace to mysys.
mysys/stacktrace.c:
  Move stacktrace to mysys and add weak symbol for the
  C++ name de-mangling function so that it can later be
  overridden in C++ code. Also add my_ prefix to exported
  functions.
sql/CMakeLists.txt:
  stacktrace was moved to mysys.
sql/Makefile.am:
  stacktrace was moved to mysys.
sql/mysqld.cc:
  Add my_ prefix to mysys functions.
2008-06-18 13:17:15 -03:00
Narayanan V
72b74d5812 WL#4380
added a rule that use gcc to generate preprocessor output (gcc -E)
that can be then compared to a already generated output using 
the diff utility.

Ran make test on the repository to verify changes.



Makefile.am:
  Added a rule for checking that the abi/api has not changed.
  
  The following steps are followed in the rule in makefile.am
  
   1) Generate preprocessor output for the files that need to
      be tested for abi/api changes. use -nostdinc to prevent 
      generation of preprocessor output for system headers. This 
      results in messages in stderr saying that these headers 
      were not found. Redirect the stderr output to /dev/null 
      to prevent seeing these messages.
   2) sed the output to remove blank lines and lines that begin
      with # (The header information is retained to enable easy
      analysis of abi diffs at a later stage).
   3) diff the generated file and the canons (.pp files already in
      the repository).
   4) delete the .out file that is generated.
  
   If the diff fails, the generated file is not removed. This will
   be useful for analysis of ABI differences (e.g. using a visual
   diff tool).
  
   A ABI change that causes a build to fail will always be  
   accompanied by new canons (.out files). The .out files that
   are not removed will be replaced as the new .pp files.
  
   e.g. If include/mysql/plugin.h has an ABI change then this
   rule would leave a include/mysql/plugin.out file.
  
   A developer with a justified API change will then do a
   mv include/mysql/plugin.out include/mysql/plugin.pp to 
   replace the old canons with the new ones.
configure.in:
  1) Removed the part of the file that was icheck related.
  
  2) Added an entry for the configure variable DIFF
include/mysql.h.pp:
  The pre-processor output canon file for include/mysql.h
include/mysql/plugin.h.pp:
  The pre-processor output canon file for include/mysql/plugin.h
include/mysql_h.ic:
  since the icheck target has been removed, this file need
  no longer be present in the repository
sql/mysql_priv.h.pp:
  The pre-processor output canon file for sql/mysql_priv.h
2008-06-17 17:57:04 +05:30
mysqldev
dd64a86af4 Raise version number after cloning 5.0.64 2008-06-10 14:25:21 +02:00
unknown
59a880f951 Raise version number after cloning 5.1.25-rc 2008-05-21 09:59:58 +02:00
unknown
b2fe762e02 Raise version number after cloning 5.0.62 2008-05-16 11:01:59 +02:00
unknown
b9efbe4890 Raise version number after cloning 5.0.60 2008-04-23 20:54:53 +02:00
unknown
91b3983e50 Raise version number after cloning 5.1.24-rc 2008-03-31 19:05:18 +02:00
unknown
18a01ce924 fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
unknown
532da5ebc7 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
scripts/mysql_config.sh:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2008-03-14 14:41:08 +01:00
unknown
d6df18dd33 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
include/my_global.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/lib_sql.cc:
  Auto merged
mysql-test/include/mix1.inc:
  Auto merged
mysql-test/r/create.result:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/innodb_mysql.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/create.test:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/handler.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_cmpfunc.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
  Auto merged
tests/mysql_client_test.c:
  Auto merged
mysql-test/r/func_time.result:
  Manual merge.
mysql-test/r/view.result:
  Manual merge.
mysql-test/t/view.test:
  Manual merge.
scripts/mysql_config.sh:
  Manual merge.
sql-common/client.c:
  Manual merge.
sql/sql_parse.cc:
  Manual merge.
2008-03-12 11:19:46 +03:00
unknown
1cddfc2f42 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0


configure.in:
  Auto merged
2008-03-05 10:24:28 +01:00
unknown
4d09306dd1 Raise the version number after cloning 5.0.58 2008-03-03 21:19:58 +01:00
unknown
1113518436 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build


config/ac-macros/misc.m4:
  Auto merged
configure.in:
  Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
  Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
  Auto merged
2008-02-26 18:38:43 +01:00
unknown
720b3d15d8 Merge mysql.com:/home/kent/bk/build/mysql-4.1-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build


ndb/src/common/util/SocketServer.cpp:
  Auto merged
2008-02-26 18:21:45 +01:00
unknown
b93e09a27e configure.in:
Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
SocketServer.cpp:
  Corrected typo in debug error message


ndb/src/common/util/SocketServer.cpp:
  Corrected typo in debug error message
configure.in:
  Corrected calculation of version id, incorrect last two digits if < 10
  Keep "sp1" or "a" in MYSQL_NO_DASH_VERSION, to set correct version in
  RPM spec file
  Added MYSQL_NUMERIC_VERSION that is like MYSQL_NO_DASH_VERSION before
  Added clear doc how the different version variables differ
2008-02-26 18:18:03 +01:00
unknown
173efef438 Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236
into  kaamos.(none):/data/src/opt/mysql-5.1-opt


configure.in:
  Auto merged
mysql-test/r/strict.result:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/unireg.h:
  Auto merged
2008-02-20 00:37:51 +03:00
unknown
61c31af45d Fix for bug #31236: Inconsistent division by zero behavior for
floating point numbers

Some math functions did not check if the result is a valid number
(i.e. neither of +-inf or nan).

Fixed by validating the result where necessary and returning NULL in
case of invalid result.


BitKeeper/deleted/.del-matherr.c:
  Rename: sql/matherr.c -> BitKeeper/deleted/.del-matherr.c
configure.in:
  Removed DONT_USE_FINITE, it is not used anywhere.
include/my_global.h:
  isfinite() is a C99 macro which absoletes finite(). First try to use
  it, then fall back to finite() if the target platform has it,
  otherwise use our own implementation.
mysql-test/r/func_math.result:
  Added a test case for bug #31236.
mysql-test/r/strict.result:
  Fixed a test case which relied on old behavior.
mysql-test/t/func_math.test:
  Added a test case for bug #31236.
mysql-test/t/strict.test:
  Fixed a test case which relied on old behavior.
sql/field.cc:
  No need to check if the finite() or its equivalent is available.
sql/item_func.cc:
  Use fix_result() wherever the result can be one of +-inf or nan, 
  assuming the function arguments are valid numbers.
  Removed fix_result() from functions that are defined for all possible
  input numbers.
sql/item_func.h:
  Moved fix_result() from Item_dec_func to Item_func which is a common
  ancestor for Item_dec_func and Item_num_op.
sql/unireg.h:
  Removed POSTFIX_ERROR because no code returns it.
2008-02-20 00:33:43 +03:00
unknown
a62818f335 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1


configure.in:
  Auto merged
extra/resolveip.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/disabled.def:
  Take both new entries into "disabled.def".
2008-02-13 13:05:07 +01:00
unknown
cf3a6d620b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build


configure.in:
  Auto merged
2008-02-12 18:08:41 +01:00
unknown
d9831ae532 Bug#31891 Meaningful stack trace
On crashes generate a user-friendly resolved and demangled stack
trace when libc provides the necessary functions (newer libc on i386,
x86_64, powerpc, ia64, alpha and s390). Otherwise print a numeric
stack trace as before, relying on resolve_stack_dump utility.


configure.in:
  Add check for backtrace headers, backtrace functions and if
  __cxa_demangle (libstdc++) is available at link time.
sql/mysqld.cc:
  Print the value of the THD::killed variable when dumping. In
  some circumstances knowing if the thread was killed makes
  debugging easier.
sql/stacktrace.c:
  Use the glibc backtrace function when available and demangle
  C++ function names if the __cxa_demangle function is available.
sql/stacktrace.h:
  Locally export and wrap in C linkage the C++ function __cxa_demangle
  if available.
2008-02-07 19:58:06 -02:00
unknown
047d7d0791 Raise version number after cloning 5.0.56 2008-02-06 14:18:26 +01:00
unknown
ebce23676c Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build


configure.in:
  Auto merged
2008-01-31 20:40:55 +01:00
unknown
57e9d4c6c3 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build


configure.in:
  Auto merged
2008-01-31 20:36:13 +01:00
unknown
bf541d14f2 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/handler.cc:
  Manual merge
sql/item.cc:
  Manual merge
2008-01-25 10:37:29 -07:00
unknown
450cd35b89 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint


configure.in:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
2008-01-23 13:50:27 -05: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
6c26935035 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51


client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sp.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/item_sum.cc:
  Manual merge.
2008-01-22 15:56:15 -07:00
unknown
b9ec8f6aba Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1


configure.in:
  Auto merged
client/mysqldump.c:
  Auto merged
sql/item_sum.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
sql/unireg.cc:
  Auto merged
2008-01-19 22:32:48 +03:00
unknown
37ff91b3bf Raise version number after cloning 5.1.23-rc 2008-01-19 12:39:49 +01:00
unknown
26af3c7e35 Bug#33728 Atomic builtins
Use compiler provided atomic builtins as a 'backend' for
MySQL's atomic primitives. The builtins are available on
a handful of platforms and compilers.


configure.in:
  Check if the compiler provides atomic builtins and
  that __sync_lock_test_and_set stores the correct value.
include/atomic/nolock.h:
  Use the atomic builtins if available.
include/atomic/gcc_builtins.h:
  Implement the atomic ADD, SWAP, CAS, STORE (or operation
  optimized away) and LOAD primitives using atomic builtins
  provided by the compiler.
2008-01-11 20:34:36 -02:00