Commit graph

1746 commits

Author SHA1 Message Date
Joerg Bruehe
0f1547a0ab Fix Bug #47957
A build "--without-server" fails if using "--with-ssl" (YaSSL)

The problem was the lack of directory "extra" in a build
which did not include the server.
2009-10-09 21:31:37 +02:00
Jon Olav Hauglid
0eccb93214 Bug #44651 "have_community_features" variable should be renamed
"have_profiling"

1) Renamed have_community_features server system variable to
have_profiling.
2) Removed eable-community-features configure option and
ENABLE_COMMUNITY_FEATURES macro.
3) Removed COMMUNITY_SERVER macro and replaced its usage by 
ENABLED_PROFILING.

Only --enable-profiling is now needed to enable profiling.
It was the only existing "community feature", so there was
no need for both configure options.

Using --enable-community-features will give a warning message
since it no longer exists.
2009-10-09 15:59:25 +02:00
Alexander Nozdrin
5afc219d01 Merge from mysql-trunk. 2009-10-09 13:23:23 +04:00
Alexander Nozdrin
f1c6580b49 Change the version tag (to 5.5.0). 2009-10-09 13:22:26 +04:00
hery.ramilison@sun.com
0e8c86f426 Raise version number after cloning 5.1.40 2009-10-06 19:37:08 +02:00
Georgi Kodinov
db35fb7961 automerge 2009-10-04 12:15:05 +03:00
Ingo Struewing
21586dfb08 WL#4259 - Debug Sync Facility
Backport from 6.0 to 5.1.
Only those sync points are included, which are used in debug_sync.test.

  The Debug Sync Facility allows to place synchronization points
  in the code:
  
  open_tables(...)
  
  DEBUG_SYNC(thd, "after_open_tables");
  
  lock_tables(...)
  
  When activated, a sync point can
  
  - Send a signal and/or
  - Wait for a signal
  
  Nomenclature:
  
  - signal:            A value of a global variable that persists
                       until overwritten by a new signal. The global
                       variable can also be seen as a "signal post"
                       or "flag mast". Then the signal is what is
                       attached to the "signal post" or "flag mast".
  
  - send a signal:     Assign the value (the signal) to the global
                       variable ("set a flag") and broadcast a
                       global condition to wake those waiting for
                       a signal.
  
  - wait for a signal: Loop over waiting for the global condition until
                       the global value matches the wait-for signal.
  
  Please find more information in the top comment in debug_sync.cc
  or in the worklog entry.
2009-09-29 17:38:40 +02:00
karen.langford@sun.com
5ad32f3e89 Raise version number after cloning 5.0.87 2009-10-13 20:50:37 +02:00
Joerg Bruehe
650e68b7dc Merge 5.1-build up into 5.4-build ("trunk-build"). 2009-09-28 11:39:36 +02:00
Joerg Bruehe
1d9c5686c3 Upmerge 5.0-build -> 5.1-build. 2009-09-28 11:07:31 +02:00
Joerg Bruehe
793e369bfe Merge the fix for bug#47137 into 5.0-build
Solaris binary packages should be compiled with '-g0', not '-g'
2009-09-28 10:43:26 +02:00
Alexander Nozdrin
72feecb4f0 Update version in configure.in. 2009-09-23 13:50:31 +04:00
Alexander Nozdrin
140d81e96d Update version. 2009-09-22 18:21:44 +04:00
Joerg Bruehe
275cec8026 Fix bug#47137
Solaris binary packages should be compiled with '-g0', not '-g'

The main fix for this is done in the build tools,
but in the sources it affects "configure.in"
which sets "DEBUG_CXXFLAGS" to be used in all debug builds.
2009-09-17 21:50:54 +02:00
Joerg Bruehe
67bcf54df6 Fix bug#46980
Option "--without-server" still not working in 5.1

The general approach is to make sure that source files
which require thread support are only compiled if the build
really needs thread support,
which means when the server is built or a thread-safe client
library.

This required several changes:
- Make sure the subdirectories "storage/" and "plugin/" are
  only processed if the server is built, not ifclient-only.
- Make the compilation of some modules which inherently
  require threading depend on thread supportin the build.
- Separate the handling of threading in "configure.in" from
  that of server issues, threading is also needed in a
  non-server build of a thread-safe client library.

Also, "libdbug" must get built even in a client-only build,
so "dbug/" must be in the list of client directories.

In addition, calls to thread functions in source files which
can be built without thread support must use the wrapper
functions which handle the non-threaded build.
So the modules "client/mysqlimport.c" and "client/mysqlslap.c"
must call "my_thread_end()" only via "mysql_thread_end()".
2009-09-17 18:34:24 +02:00
hery.ramilison@sun.com
cdc2cfb5f1 Raise version number after cloning 5.0.86 2009-09-08 22:56:00 +02:00
Jonathan Perkin
28b0d8a218 Raise version number after cloning 5.1.39 2009-09-03 18:20:43 +02:00
joerg.bruehe@sun.com
a8037cbf9d Raise version number after cloning 5.4.2-beta 2009-08-26 11:59:49 +02:00
sunanda.menon@sun.com
fba963ea93 Raise version number after cloning 5.0.85 2009-08-11 07:16:52 +02:00
Guilhem Bichot
c5ab943afe Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:
bzr branch mysql-5.1-performance-version mysql-trunk # Summit
cd mysql-trunk
bzr merge mysql-5.1-innodb_plugin # which is 5.1 + Innodb plugin 
bzr rm innobase # remove the builtin
Next step: build, test fixes.
2009-08-04 13:25:19 +02:00
karen.langford@sun.com
21cbee126a Raise version number after cloning 5.1.38 2009-08-12 16:41:07 +02:00
timothy.smith@sun.com
013e729e3d Raise version number after cloning 5.1.37 2009-07-13 22:43:31 +02:00
sunanda.menon@sun.com
e60ea9e8ac Raise version number after cloning 5.0.84 2009-07-07 11:47:23 +02:00
Mikael Ronstrom
9cfd7a006d Merged in 5.1.35 2009-07-01 14:36:40 +02:00
Christoffer Hall
eaf50ced6d Merge from main branch 2009-06-29 14:55:22 +02:00
MySQL Build Team
c91e9b4376 Un-drop version number after fiddling with mysql-5.4.1-release branch 2009-06-25 22:09:25 +02:00
Alexey Kopytov
824e0d99fc Automerge. 2009-06-26 17:59:52 +04:00
Alexey Kopytov
c22c91bdbd Automerge. 2009-06-26 17:52:44 +04:00
MySQL Build Team
286571d2a8 TEMPORARY drop of version number, only in 5.4.1-release branch 2009-06-24 01:24:20 +02:00
Christoffer Hall
77fb9608a9 BUG#42721 configure.in invokes 'nm' directly
A hardcoded use of nm and libc was put into configure.in. This broke
cross-compiling and is bad practice. Fitting variables now used.
2009-06-22 14:43:19 +02:00
Georgi Kodinov
cafcd7094f automerge 2009-06-22 14:53:22 +03:00
Davi Arnaut
f6ea8b7675 Bug#42599: error: `pthread_setschedprio' was not declared in this scope
The problem was that a pthread.h header used by gcc did not
declare the pthread_setscheprio, yet the function is implemented
by the function is implemented, causing a autoconf check to pass
and compilation with C++ to fail. The solution is to add a
autoconf check to ensure that the function is properly declared.
2009-06-18 20:21:47 -03:00
Alexey Kopytov
7a512334e9 Bug #41710: MySQL 5.1.30 crashes on the latest OpenSolaris 10
Change the default optimization level for Sun Studio to "-O1". 
This is a workaround for a Sun Studio bug (see bug #41710 
comments for details): 
 
1. Use $GCC instead of $ac_cv_prog_gcc to check for gcc, since 
the first one is the only documented way to do it. 
 
2. Use $GXX instead of $ac_cv_prog_cxx_g to check for g++, 
since the latter is set to "yes" when the C++ compiler accepts 
"-g" which is the case for both g++ and CC. 
 
3. When building with Sun Studio, set the default values for 
CFLAGS/CXXFLAGS to "-O1", since unlike GCC, Sun Studio 
interprets "-O" as "-xO3" (see the manual pages for cc and CC).
2009-06-18 17:11:47 +04:00
Jonathan Perkin
b660e14b04 Raise version number after cloning 5.1.36 2009-06-16 14:00:04 +02:00
timothy.smith@sun.com
a263d74ea5 Raise version number after 5.4.1-beta build 2009-06-12 17:22:42 +02:00
Mikael Ronstrom
506c7fd47d Merge MySQL 5.1.35 into MySQL 5.4 2009-06-11 12:07:59 +02:00
hery.ramilison@sun.com
8aae58fb73 Raise version number after cloning 5.0.83 2009-05-29 19:45:32 +02:00
MySQL Build Team
60cad950c9 Bug #44536: MySQL 5.4 version mismatch in the sources
Update version number; also modify NDB's version.c for compatibility.
2009-05-22 21:05:46 +02:00
Jonathan Perkin
28183ac3a9 Raise version number after cloning 5.1.35 2009-05-14 13:07:11 +02:00
karen.langford@sun.com
fa7b5814f6 Raise version number after cloning 5.0.82 2009-05-07 21:42:19 +02:00
Chad MILLER
128afdc3e5 Merge community up to enterprise, thus ending the community-server
adventure.
2009-05-06 09:06:32 -04:00
Chad MILLER
9d58239dea Pull 5.1 treatment of community features into 5.0. 2009-05-05 17:03:23 -04:00
Georgi Kodinov
4ad430f8cd merged 5.0-main to 5.0-bugteam 2009-04-30 16:39:00 +03:00
Georgi Kodinov
361bd1a7c3 bumped the version to 5.0.82 (5.0.81-community to be released) 2009-04-16 16:47:02 +03:00
Chad MILLER
978e8e06b0 Merge 5.0.80 release and 5.0 community. Version left at 5.0.80. 2009-04-14 13:20:13 -04:00
karen.langford@sun.com
ae599fcd2c Raise version number after cloning 5.0.80 2009-04-13 19:50:28 +02:00
Georgi Kodinov
dccbde7a11 merged 5.1-main -> 5.1-bugteam 2009-04-01 12:57:34 +03:00
Jonathan Perkin
22f240348d Raise version number after cloning 5.1.34 2009-03-30 13:27:23 +02:00
Alexey Kopytov
1517db6ba1 Automerge. 2009-03-25 16:19:53 +03:00
Alexey Kopytov
38828c1757 Manual merge. 2009-03-25 15:48:29 +03:00
Alexey Kopytov
73cb9b6e04 Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can
produce incorrect results for ROUND() 

Added a workaround and a configure check to test whether 
isinf() is affected by the GCC bug #39228. 
       
Since no code in MySQL server is currently affected by that 
bug, the patch is actually a safeguard for possible future 
code modifications. No test cases or changelog entries are 
needed.
2009-03-24 11:26:22 +03:00
Georgi Kodinov
b71a73c7e2 reverting a bogus fix into 5.1-bugteam 2009-03-20 13:18:29 +02:00
Chad MILLER
b4656bd714 Merge bugteam and contributed two patches from
Antony Dovgal <tony @ daylessday.org> .  SCA signed and faxed to
tel:+1-408-715-2540.  Patches tweaked by Chad.
2009-03-19 09:53:54 -04:00
Chad MILLER
f30dda6ff1 Copy include/config.h to include/my_config.h at configure-time. Also,
continue to update it at make-time.

One shouldn't need to run "make" on server source to get the stuff we say
plugins should use.
2009-03-19 09:37:30 -04:00
Chad MILLER
51e0a699a7 Using autoconf definitions instead of manually appending to CFLAGS is
smarter, and according to a contributer, it is necessary for plugin authors
using "--with-debug".
2009-03-18 08:49:05 -04:00
Jonathan Perkin
3ed5a61f29 Raise version number after cloning 5.1.33 2009-03-13 21:01:19 +01:00
kent.boortz@sun.com
e400c54a06 Raise version number after cloning 5.0.79 2009-03-09 19:33:01 +01:00
Georgi Kodinov
93a58abe87 merged 5.1-main -> 5.1-pe-stage 2009-03-09 12:52:08 +02:00
Joerg Bruehe
eacedc8a99 Merge main 5.1 into 5.1-build 2009-02-28 17:35:00 +01:00
kent.boortz@sun.com
4f11a82b5c Insert current year as last copyright year for the product
Don't use both "License" and "license" as RPM macro, they are the same
2009-02-24 17:54:03 +01:00
Alexey Kopytov
2247fb7cd1 Manual merge to 5.1. 2009-02-23 14:42:31 +02:00
Alexey Kopytov
cebaf077d2 Fix for bug #15936: "round" differs on Windows to Unix
Both of our own implementations of rint(3) were inconsistent with the
most common behavior of rint() on those platforms that have it: round
to nearest, break ties by rounding to nearest even.

Fixed by leaving just one implementation of rint() in our source tree,
and changing its behavior to match the most common native
implementations on other platforms.
2009-02-23 14:28:26 +02:00
MySQL Build Team
5b7b1c8244 Increase -pv- version number after branching 0.2.1 build clone 2009-02-19 21:20:51 +01:00
Staale Smedseng
ac8f752e92 Bug#31506 detection of function's availability is wrong in
configure.in

Replacing AC_CHECK_FUNC+AC_CHECK_LIB combination with
AC_SEARCH_LIBS.
2009-02-19 11:24:52 +01:00
Mikael Ronstrom
dd9119be20 Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01.13 2009) 2009-02-17 13:24:09 +01:00
kent.boortz@sun.com
1f18af1acb Raise version number after cloning 5.1.32 2009-02-11 14:58:50 +01:00
Mikael Ronstrom
d48cea15cc Workaround for DTrace-related bugs.
Bumped up version number to 0.2.1
2009-02-10 15:26:39 +01:00
9969fbff70 Raise version number after cloning 5.0.78 2009-02-07 05:47:21 +01:00
Davi Arnaut
faaa5febe4 Bug#42524: Function pthread_setschedprio() is defined but seems broken on i5/OS PASE
The problem is that MySQL use of pthread_setschedprio is not
supported by i5/OS and the default system behavior for unsupported
calls is to emit a SIGILL signal which causes the server to
abort.

The solution is to treat the pthread_setschedprio as inexistent
when compiling binaries for i5/OS. This also does not invalidate
the fix for bug 38477 as the only supported dispatch class is
SCHED_OTHER (which is passed to pthread_setschedparam).
2009-02-06 09:00:09 -02:00
Mikael Ronstrom
b040b460ed Added support for rep; nop replacing PAUSE due to Solaris bug
Replaced abs_top_srcdir with top_srcdir, not sure it's an
improvement but at least it's known that abs_top_srcdir
in cases have a problem and this is a more common variable
to use for the same purpose.
2009-02-03 12:46:52 +01:00
MySQL Build Team
d6ac37e194 Use AC_TRY_RUN instead of AC_TRY_LINK when checking for x86 PAUSE instruction support, due to http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 . 2009-02-01 02:34:39 +01:00
Joerg Bruehe
cf11f38c01 Raise the version number in this (enterprise) tree, 5.0.77 will be a community build. 2009-01-29 22:43:52 +01:00
Luis Soares
14d4576bfe merge: 5.1 -> 5.1-rpl
conflicts:
  Text conflict in client/mysqltest.cc
  Text conflict in mysql-test/include/wait_until_connected_again.inc
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
  Text conflict in mysql-test/r/events_bugs.result
  Text conflict in mysql-test/r/log_state.result
  Text conflict in mysql-test/r/myisam_data_pointer_size_func.result
  Text conflict in mysql-test/r/mysqlcheck.result
  Text conflict in mysql-test/r/query_cache.result
  Text conflict in mysql-test/r/status.result
  Text conflict in mysql-test/suite/binlog/r/binlog_index.result
  Text conflict in mysql-test/suite/binlog/r/binlog_innodb.result
  Text conflict in mysql-test/suite/rpl/r/rpl_packet.result
  Text conflict in mysql-test/suite/rpl/t/rpl_packet.test
  Text conflict in mysql-test/t/disabled.def
  Text conflict in mysql-test/t/events_bugs.test
  Text conflict in mysql-test/t/log_state.test
  Text conflict in mysql-test/t/myisam_data_pointer_size_func.test
  Text conflict in mysql-test/t/mysqlcheck.test
  Text conflict in mysql-test/t/query_cache.test
  Text conflict in mysql-test/t/rpl_init_slave_func.test
  Text conflict in mysql-test/t/status.test
2009-01-23 13:22:05 +01:00
kent.boortz@sun.com
5a1d0901e4 Raise version number after cloning 5.1.31 2009-01-15 16:48:10 +01:00
MySQL Build Team
d535a2b92e Oops, bumped version too high. Drop it back down from 5.0.78 to 5.0.77. 2009-01-15 00:14:07 +01:00
timothy.smith@sun.com
10408c632d Raise version number after cloning 5.0.76 2009-01-14 20:16:10 +01:00
Luis Soares
9d8c117598 merge: 5.1 -> 5.1-rpl
conflicts:
  Text conflict in mysql-test/lib/mtr_report.pm
  Text conflict in mysql-test/mysql-test-run.pl
2009-01-08 19:03:56 +00:00
Mikael Ronstrom
d074e55a80 performance version in MySQL Version name created too long file names
for files in tar command as part of make of a source distribution.
Only 99 characters are supported. Abbreviated performance version
by pv thus. Should be ok since shorter than ndb, and if MySQL Cluster
Carrier Grade Edition has thus 1 character longer version names.
2008-12-20 16:15:46 +01:00
Mikael Ronstrom
b3f2db1dcc Fixed removal of server-tools (instance manager) 2008-12-20 15:36:28 +01:00
Mikael Ronstrom
806cf36be0 A number of fixes to DTrace patch
Removed instance manager from builds
2008-12-20 15:16:46 +01:00
Mikael Ronstrom
c268f4318c Merged DTrace patch into performance version 2008-12-20 12:07:32 +01:00
Mikael Ronstrom
9ae3ecbc85 Set new version number for performance version 2008-12-20 11:57:37 +01:00
Mikael Ronstrom
460cde4c6e Merge dtrace patch with latest performance version 2008-12-20 11:53:27 +01:00
Mikael Ronstrom
16a024c486 Backport of DTrace patches from 6.0 2008-12-20 11:01:41 +01:00
joerg@mysql.com
a2dcb63579 Raise version number after cloning 5.0.75 2008-12-18 17:53:47 +01:00
Chad MILLER
1c73da70ce Merged from 5.0 (enterprise). 2008-12-17 15:01:34 -05:00
Joerg Bruehe
a613f1dc73 Merge the 5.0.74 build into the main tree. 2008-12-17 19:55:08 +01:00
Mikael Ronstrom
cb52ac91da Merge latest 5.1 into performance version 2008-12-15 09:47:39 +01:00
Mikael Ronstrom
8e2b83e733 Added a PAUSE instruction to the SPIN loop
according to recommendation from Intel.
2008-12-10 14:02:52 +01:00
Mikael Ronstrom
abae8a2c9c Added large page support for Solaris
Change defaults, now large page support is default if supported
Introduced super-large-pages support for Solaris to use 256 MByte
page size rather than 4 MByte.
2008-12-05 19:43:45 +01:00
timothy.smith@sun.com
3742489c37 Remove bashisms from BUILD/compile-dist and configure.in, so Bootstrap works on Solaris box; force GNU make in compile-dist; remove unportable "grep -q" from configure.in 2008-12-03 05:11:48 +01:00
timothy.smith@sun.com
6a65d019d4 Raise version number after cloning 5.0.74 2008-12-03 01:09:05 +01:00
timothy.smith@sun.com
abd8574914 Merge from mysql-5.1.30-release 2008-11-27 00:02:10 +01:00
Andrei Elkin
2618337eb6 merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-rpl merging.
mysql_upgrade results changed due to the error messesge of mysqlcheck has changed.
2008-11-12 19:51:47 +02:00
Georgi Kodinov
0a677bfbcb merged 5.1-main -> 5.1-bugteam 2008-11-06 20:59:47 +02:00
kent.boortz@sun.com
a21f8a0e57 Back merges from 6.0.8
- Removed some copy/paste between debug and normal build in RPM spec
- Removed "mysql_upgrade_shell" from RPM build
- Removed use of "grep -q" in "configure.in", not portable
- Improved test to disable ABI check not to accidently run for icc

Other changes
- Added make file test targets 'test-bt-fast' and 'test-bt-debug-fast'
- Reenabled "jp" test suite run
2008-11-06 19:38:19 +01:00
kent.boortz@sun.com
b8b5e156ea Raise version number after cloning 5.1.30 2008-11-06 18:21:02 +01:00
Georgi Kodinov
90bc97a583 merged 5.1 main -> 5.1-bugteam 2008-11-06 16:18:25 +02:00
kent.boortz@sun.com
eba4984e85 Merge from mysql-5.1.29-rc-release 2008-10-27 22:26:58 +01:00
Joerg Bruehe
64dc750b17 Merge a correction for the 38098 bug into 5.0-build,
it will also be used in the 5.0.72 release.
2008-10-27 19:52:24 +01:00
Joerg Bruehe
927534d525 Fix a "configure" syntax error.
It had been introduced with the patch for bug entry 37098
and affected runs "--without-server" only.
2008-10-24 17:34:17 +02:00
joerg@mysql.com
51a960e3bb Raise version number after cloning 5.0.72 2008-10-24 11:37:40 +02:00
Mats Kindahl
1f29c52581 Merging 5.1 main into 5.1-rpl 2008-10-23 21:27:09 +02:00
Davi Arnaut
459b8b3dd2 Bug#38477: my_pthread_setprio can change dispatch class on Solaris, not just priority
The problem is that the function used by the server to increase
the thread's priority (pthread_setschedparam) has the unintended
side-effect of changing the calling thread scheduling policy,
possibly overwriting a scheduling policy set by a sysadmin.

The solution is to rely on the pthread_setschedprio function, if
available, as it only changes the scheduling priority and does not
change the scheduling policy. This function is usually available on
Solaris and Linux, but it use won't work by default on Linux as the
the default scheduling policy only accepts a static priority 0 -- this
is acceptable for now as priority changing on Linux is broken anyway.
2008-10-15 19:28:26 -03:00
Mikael Ronstrom
99f5183d1e Merged patch for bug#38477 2008-10-15 11:57:31 +02:00
Mikael Ronstrom
47a8904c2e Included patch for bug#38477 2008-10-15 11:50:21 +02:00
Mikael Ronstrom
c45bd8ce96 Performance patch: Mysql atomic patch 2008-10-13 22:03:12 +02:00
kent.boortz@sun.com
d8e9fef0fa More portable sh in configure script 2008-10-11 23:51:58 +02:00
Build Team
b5720ac48f Added "-rc" to the version
Removed use of __FUNCTION__
2008-10-11 01:12:39 +02:00
kent.boortz@sun.com
b532dbeaa3 Raise version number after cloning 5.1.29-rc 2008-10-10 13:54:46 +02:00
Georgi Kodinov
90e0541915 set back version to 5.1.29 2008-10-09 15:46:03 +03:00
Chad MILLER
7fa30b2858 Merge fix of autoconf substitution of string containing single quotes. 2008-10-06 11:49:53 -04:00
Chad MILLER
5cee4d7cf6 Fix autoconf substitution and evaluation of a string inside single quotes
so that if the substitution contains single-quotes, the program will fail.
2008-10-06 11:35:21 -04:00
Chad MILLER
e1fa6c0663 Merge fix for bug 11122. 2008-10-06 09:54:00 -04:00
Chad MILLER
7e59ecb110 Merge fix for bug 11122. 2008-10-06 09:52:27 -04:00
Chad MILLER
0859e33c97 Remove part of comment for b-g#11122 that is no longer true. 2008-10-06 09:49:50 -04:00
Mats Kindahl
2974607a4b Merging 5.1 main into 5.1-rpl. 2008-10-06 10:27:36 +02:00
Chad MILLER
5317b7de8a Bug#11122: Server won't always start when cold-booting after a crash
The grep expression that finds a running "mysqld" program fails if the
"mysqld_safe" is running with the same PID.

Now, excise "ps" output that has the word " grep" or "mysqld_safe" in 
it, to be a little more certain that the matched process is not a false 
positive hit.  This will fail when the path to mysqld contains either
of those two names, which should be acceptable.

Additionally, some text to search could be truncated if very long.  
Expand the number of lines "ps" emits.
2008-10-02 12:25:52 -04:00
Georgi Kodinov
d80f408d63 merged 5.0-main -> 5.0-bugteam 2008-10-01 12:42:45 +03:00
timothy.smith@sun.com
68674082ff Raise version number after cloning 5.0.70 2008-09-19 15:48:46 +02:00
Timothy Smith
fb2c9d8232 Auto merge 5.1-build -> 5.1-bugteam 2008-09-10 19:35:11 -06:00
Joerg Bruehe
24ec9a3dc5 Merge main 5.1 tree into 5.1-build team tree. 2008-09-10 15:11:28 +02:00
Georgi Kodinov
772cdf0000 merged 5.0-bugteam to 5.1-bugteam 2008-09-10 12:55:38 +03:00
He Zhenxing
6e86e05823 Merge 5.1 main -> 5.1-rpl 2008-09-06 08:51:17 +08:00
Narayanan V
5220e3f4ea updating server version number 2008-09-05 20:20:26 +05:30
Narayanan V
9e8851b158 merging mysql-5.1->mysql-5.1-sea 2008-09-04 17:23:16 +05:30
kent@mysql.com
8eae64aab8 Raise version number after cloning 5.1.28-rc 2008-08-28 16:51:00 +02:00
mysqldev
b905353bb2 Added "-rc" to the release number 2008-08-28 16:16:43 +02:00
Joerg Bruehe
4cff4db39b Merge the bug fix development (37098: "unpackaged files")
into the 5.0 team tree.
2008-08-27 16:25:24 +02:00
Joerg Bruehe
811337dd72 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.
2008-08-27 16:03:39 +02:00
Joerg Bruehe
ff3d230a03 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.
2008-08-25 21:07:41 +02:00
Joerg Bruehe
d2c1c3977b Correct the version number to 5.0.70. 2008-08-13 12:34:35 +02:00
timothy.smith@sun.com
1ae849bbdd Raise version number after cloning 5.0.68 2008-08-13 11:05:24 +02:00
Narayanan V
eaeef49954 WL#4380
Added a comment to the abi_check related
part of configure.in
2008-08-11 16:55:09 +05:30
Narayanan V
c5095f77f8 WL#4380
1) Disabled abi_check rule for all compilers except gcc
2) restored the -dI option to retain the header information.
2008-08-08 14:30:05 +05:30
Sven Sandberg
73e253370b merged 5.1 main to 5.1-rpl
manually resolved conflicts:
Text conflict in client/mysqltest.c
Contents conflict in mysql-test/include/have_bug25714.inc
Text conflict in mysql-test/include/have_ndbapi_examples.inc
Text conflict in mysql-test/mysql-test-run.pl
Text conflict in mysql-test/suite/parts/inc/partition_check_drop.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check1.inc
Text conflict in mysql-test/suite/parts/inc/partition_layout_check2.inc
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_1_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter1_2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter2_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_alter3_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_innodb.result
Text conflict in mysql-test/suite/parts/r/partition_basic_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_basic_symlink_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_engine_myisam.result
Text conflict in mysql-test/suite/parts/r/partition_syntax_myisam.result
Text conflict in mysql-test/suite/rpl_ndb/t/disabled.def
Text conflict in mysql-test/t/disabled.def
2008-08-04 07:04:47 +02:00
Narayanan V
10aa617276 merging mysql-5.1 -> mysql-5.1-sea 2008-07-31 16:59:41 +05:30
Chad MILLER
27699fac9c Make community features (including profiling) on by default. 2008-07-24 13:43:14 -04:00
Jonathan Perkin
7ab218f8ce Raise version number after cloning 5.0.67 2008-07-16 18:07:16 +02:00
Jonathan Perkin
fed7ec37de Put version number back to 5.0.67 2008-07-16 17:47:30 +02:00
Chad MILLER
dae4c823e9 Merge from 5.0 trunk. 2008-07-14 16:16:37 -04:00
Chad MILLER
c94a46240a Merge chunk from trunk. 2008-07-10 14:50:07 -04:00
Chad MILLER
06756c19c5 Merge chunk from trunk. 2008-07-10 14:47:53 -04:00
Thava Alagu
39272e5538 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
d9289b8832 Merge from main 5.0 to 5.0-build. 2008-07-09 13:17:53 +02:00
kent@mysql.com
443698a56d Raise version number after cloning 5.0.66 2008-07-09 08:23:30 +02:00
Sven Sandberg
500aa80db3 Merge 5.1 -> 5.1-rpl 2008-07-06 19:07:30 +02:00
Daniel Fischer
43af930e71 ild can not be expected on all matching installs 2008-07-05 09:44:10 +02:00
Joerg Bruehe
d021db69fc We may need 5.1.27 for selected pushes, so reserve the number. 2008-06-30 12:54:18 +02:00
Gleb Shchepa
6cf0fcbf9e auto merge 5.1-main --> 5.1-bugteam 2008-06-25 14:44:55 +05:00
Joerg Bruehe
3f33b44aaa Correct the version number, after cloning 5.1.26 the next one is 27 2008-06-20 19:06:03 +02:00
Joerg Bruehe
a51718eeb6 Raise version number after cloning 5.1.26 2008-06-20 14:54:48 +02:00
Davi Arnaut
e7f3c5fc44 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.
2008-06-19 11:02:32 -03:00
Davi Arnaut
30bd1d7cb3 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.
2008-06-18 13:17:15 -03:00
Narayanan V
2f472dff75 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.
2008-06-17 17:57:04 +05:30
mysqldev
5e9ce47992 Raise version number after cloning 5.0.64 2008-06-10 14:25:21 +02:00
Magnus Svensson
3d34d34c88 Merge 5.1->5.1-rpl
Fix paths and name of a few files to make it work with new mtr.pl
2008-05-30 11:12:07 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
94d237b19c Raise version number after cloning 5.1.25-rc 2008-05-21 09:59:58 +02:00
jperkin/mysqldev@mysql.com/production.mysql.com
743ad144eb Raise version number after cloning 5.0.62 2008-05-16 11:01:59 +02:00
kent/mysqldev@mysql.com/production.mysql.com
2b104da994 Raise version number after cloning 5.0.60 2008-04-23 20:54:53 +02:00
msvensson@pilot.mysql.com
a011d27cf9 Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-04-03 11:50:43 +02:00
kent/mysqldev@mysql.com/production.mysql.com
3cfd16da53 Raise version number after cloning 5.1.24-rc 2008-03-31 19:05:18 +02:00
gkodinov/kgeorge@macbook.gmz
7cb4b7c19d fixed warnings and compile errors from the fix for bug 26243 2008-03-29 09:52:16 +02:00
joerg@trift2.
e784898959 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-03-14 14:41:08 +01:00
kaa@kaamos.(none)
0a7052e4d3 Merge kaamos.(none):/data/src/mysql-5.1
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-03-12 11:19:46 +03:00
joerg@trift2.
9ea63c2782 Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2008-03-05 10:24:28 +01:00
joerg@trift2.
687d2131de Raise the version number after cloning 5.0.58 2008-03-03 21:19:58 +01:00
msvensson@pilot.mysql.com
56a354794c Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl
into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-mtr
2008-02-28 12:21:44 +01:00
kent@kent-amd64.(none)
f3daf8ad80 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-02-26 18:38:43 +01:00
kent@kent-amd64.(none)
3426a62a9f Merge mysql.com:/home/kent/bk/build/mysql-4.1-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-02-26 18:21:45 +01:00
kent@mysql.com/kent-amd64.(none)
ff25b92543 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
2008-02-26 18:18:03 +01:00
kaa@kaamos.(none)
58240614f7 Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236
into  kaamos.(none):/data/src/opt/mysql-5.1-opt
2008-02-20 00:37:51 +03:00
kaa@kaamos.(none)
8d222210c7 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.
2008-02-20 00:33:43 +03:00
joerg@trift2.
341258dba4 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2008-02-13 13:05:07 +01:00
kent@kent-amd64.(none)
26a6f68731 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-02-12 18:08:41 +01:00
davi@mysql.com/endora.local
24830674e8 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.
2008-02-07 19:58:06 -02:00
jperkin/mysqldev@mysql.com/production.mysql.com
21487efe0a Raise version number after cloning 5.0.56 2008-02-06 14:18:26 +01:00
kent@kent-amd64.(none)
0de12b5cfd Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-01-31 20:40:55 +01:00
kent@kent-amd64.(none)
18bb8de9d6 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-01-31 20:36:13 +01:00
tsmith@ramayana.hindu.god
3906cc27d7 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-25 10:37:29 -07:00
cmiller@zippy.cornsilk.net
fdb423e8de Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2008-01-23 13:50:27 -05:00
cmiller@zippy.cornsilk.net
2d259302ea Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2008-01-23 11:53:06 -05:00
cmiller@zippy.cornsilk.net
c13d726f5d 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.
2008-01-23 11:34:08 -05:00
tsmith@ramayana.hindu.god
6668554a8d Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2008-01-22 15:56:15 -07:00
anozdrin/alik@ibm.
baf5f73853 Merge ibm.:/home/alik/Documents/MySQL/devel/5.1
into  ibm.:/home/alik/Documents/MySQL/devel/5.1-rt-merged-5.1
2008-01-19 22:32:48 +03:00
dfischer/mysqldev@mysql.com/production.mysql.com
c6a01870bc Raise version number after cloning 5.1.23-rc 2008-01-19 12:39:49 +01:00
msvensson@shellback.(none)
cf9053f199 Add C version of safe_process 2008-01-18 00:03:38 +01:00
davi@mysql.com/endora.local
e88edf6ab1 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.
2008-01-11 20:34:36 -02:00
kent@kent-amd64.(none)
ea442919a6 Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into  mysql.com:/home/kent/bk/build/mysql-5.1-build
2008-01-03 21:54:03 +01:00
kent@kent-amd64.(none)
2e6c65dc95 Merge mysql.com:/home/kent/bk/build/mysql-4.1-build
into  mysql.com:/home/kent/bk/build/mysql-5.0-build
2008-01-03 21:48:12 +01:00
kent@mysql.com/kent-amd64.(none)
a6bcf22b45 Merge mysql.com:/home/kent/bk/build/mysql-4.0
into  mysql.com:/home/kent/bk/build/mysql-4.1-build
2008-01-03 21:42:19 +01:00
kent@mysql.com/kent-amd64.(none)
9023b3a30c configure.in, acinclude.m4:
Minor cleanup, removed semicolons not needed
2008-01-03 21:38:05 +01:00
serg@janus.mylan
d9ca7b670e Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  janus.mylan:/usr/home/serg/Abk/mysql-5.1
2007-12-20 22:11:37 +01:00
cmiller@zippy.cornsilk.net
edbacd3a99 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmerge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2007-12-14 13:42:09 -05:00
kent/mysqldev@mysql.com/production.mysql.com
028ed33610 Raise version number after cloning 5.0.54 2007-12-14 16:58:12 +01:00
msvensson@pilot.mysql.com
d918988baa WL#4189
- dynamic configuration support
 - safe process
 - cleanups
 - create new suite for fedarated
2007-12-12 18:19:24 +01:00
df@pippilotta.erinye.com
bcb3c304ff Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1
2007-12-11 17:41:11 +01:00
df@pippilotta.erinye.com
de716f1f86 No we're still at 5.0.54. 2007-12-11 17:38:49 +01:00
cmiller@zippy.cornsilk.net
a35a8fe550 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
2007-12-10 15:28:17 -05:00
df@pippilotta.erinye.com
a079cb9f49 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-release
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
2007-12-10 12:02:02 +01:00