Commit graph

1739 commits

Author SHA1 Message Date
Georgi Kodinov
05dbb26dfc merged 5.1 main -> 5.1-bugteam 2008-11-06 16:18:25 +02:00
unknown
1c32bdd271 Merge from mysql-5.1.29-rc-release 2008-10-27 22:26:58 +01:00
Joerg Bruehe
02705ee284 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
b1f3962276 Fix a "configure" syntax error.
It had been introduced with the patch for bug entry 37098
and affected runs "--without-server" only.


configure.in:
  The conditional "BUILD_INNODB_TOOLS" is set depending on
  whether InnoDB is configured in the build,
  but that check is done only when building the server.
  
  For builds without the server it must also be set,
  or else "configure" reports an error.
  Set it to "false" in such builds, as this conditional
  only affects a tool that is useless in client installations.
2008-10-24 17:34:17 +02:00
unknown
408523b772 Raise version number after cloning 5.0.72 2008-10-24 11:37:40 +02:00
Mats Kindahl
32c161f3ea Merging 5.1 main into 5.1-rpl 2008-10-23 21:27:09 +02:00
Davi Arnaut
e6fa9496f5 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.

configure.in:
  Check for the existence of the pthread_setschedprio function.
include/my_pthread.h:
  Use the pthread_setschedprio function to set the thread priority
  if the function is available.
2008-10-15 19:28:26 -03:00
unknown
eab7404c8f More portable sh in configure script 2008-10-11 23:51:58 +02:00
Michael Widenius
56100f3a49 Merged 5.1 maria with 5.1 maria team tree. Automerge. 2008-10-11 11:27:03 +03:00
Build Team
7f34685963 Added "-rc" to the version
Removed use of __FUNCTION__
2008-10-11 01:12:39 +02:00
Michael Widenius
f47e003e1b Merged 5.1 with maria 5.1 2008-10-10 18:28:41 +03:00
unknown
64191b6e68 Raise version number after cloning 5.1.29-rc 2008-10-10 13:54:46 +02:00
Georgi Kodinov
d9df61cc1d set back version to 5.1.29 2008-10-09 15:46:03 +03:00
Chad MILLER
68fa4edc84 Merge fix of autoconf substitution of string containing single quotes. 2008-10-06 11:49:53 -04:00
Chad MILLER
41a1b7cead 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
a48d671703 Merge fix for bug 11122. 2008-10-06 09:54:00 -04:00
Chad MILLER
3507dc77fb Merge fix for bug 11122. 2008-10-06 09:52:27 -04:00
Chad MILLER
159b33719c Remove part of comment for b-g#11122 that is no longer true. 2008-10-06 09:49:50 -04:00
Mats Kindahl
bcaf5e0cf5 Merging 5.1 main into 5.1-rpl. 2008-10-06 10:27:36 +02:00
Chad MILLER
a1e94cc676 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
Sergei Golubchik
c7a304a264 Implement conditional building correctly.
automake *must* know all sources in advance, listing a file in EXTRA_DIST
doesn't make it a source, which breakes dependency tracking
(.Po files aren't included)
2008-10-01 22:55:23 +02:00
Georgi Kodinov
3f8e1edc31 merged 5.0-main -> 5.0-bugteam 2008-10-01 12:42:45 +03:00
unknown
34acfc1e6a Raise version number after cloning 5.0.70 2008-09-19 15:48:46 +02:00
Timothy Smith
31a620089a Auto merge 5.1-build -> 5.1-bugteam 2008-09-10 19:35:11 -06:00
Joerg Bruehe
eeb4f735e5 Merge main 5.1 tree into 5.1-build team tree. 2008-09-10 15:11:28 +02:00
Georgi Kodinov
9daa56fd5c merged 5.0-bugteam to 5.1-bugteam 2008-09-10 12:55:38 +03:00
He Zhenxing
b17458dcc1 Merge 5.1 main -> 5.1-rpl 2008-09-06 08:51:17 +08: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
mysqldev
86af3f63ff Added "-rc" to the release number 2008-08-28 16:16:43 +02:00
Joerg Bruehe
1c855bc1f1 Merge the bug fix development (37098: "unpackaged files")
into the 5.0 team tree.
2008-08-27 16:25:24 +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
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
Sven Sandberg
4cf30d44ef 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
e3e2331cdd merging mysql-5.1 -> mysql-5.1-sea 2008-07-31 16:59:41 +05:30
Sergei Golubchik
6ba12f070c WL#3064 - waiting threads - wait-for graph and deadlock detection
client/mysqltest.c:
  compiler warnings
configure.in:
  remove old tests for unused programs
  disable the use of gcc built-ins if smp assembler atomics were selected explictily.
  add waiting_threads.o to THREAD_LOBJECTS
include/lf.h:
  replace the end-of-stack pointer with the pointer to the end-of-stack pointer.
  the latter could be stored in THD (mysys_vars) and updated in pool-of-threads
  scheduler.
  constructor/destructor in lf-alloc
include/my_pthread.h:
  shuffle set_timespec/set_timespec_nsec macros a bit to be able to fill
  several timeout structures with only one my_getsystime() call
include/waiting_threads.h:
  waiting threads - wait-for graph and deadlock detection
mysys/Makefile.am:
  add waiting_threads.c
mysys/lf_alloc-pin.c:
  replace the end-of-stack pointer with the pointer to the end-of-stack pointer.
  the latter could be stored in THD (mysys_vars) and updated in pool-of-threads
  scheduler.
  constructor/destructor in lf-alloc
mysys/lf_hash.c:
  constructor/destructor in lf-alloc
mysys/my_thr_init.c:
  remember end-of-stack pointer in the mysys_var
mysys/waiting_threads.c:
  waiting threads - wait-for graph and deadlock detection
storage/maria/ha_maria.cc:
  replace the end-of-stack pointer with the pointer to the end-of-stack pointer.
  the latter could be stored in THD (mysys_vars) and updated in pool-of-threads
  scheduler.
storage/maria/ma_commit.c:
  replace the end-of-stack pointer with the pointer to the end-of-stack pointer.
  the latter could be stored in THD (mysys_vars) and updated in pool-of-threads
  scheduler.
storage/maria/trnman.c:
  replace the end-of-stack pointer with the pointer to the end-of-stack pointer.
  the latter could be stored in THD (mysys_vars) and updated in pool-of-threads
  scheduler.
storage/maria/trnman_public.h:
  replace the end-of-stack pointer with the pointer to the end-of-stack pointer.
  the latter could be stored in THD (mysys_vars) and updated in pool-of-threads
  scheduler.
storage/maria/unittest/trnman-t.c:
  replace the end-of-stack pointer with the pointer to the end-of-stack pointer.
  the latter could be stored in THD (mysys_vars) and updated in pool-of-threads
  scheduler.
unittest/mysys/Makefile.am:
  add waiting_threads-t
unittest/mysys/lf-t.c:
  factor out the common code for multi-threaded stress unit tests
  move lf tests to a separate file
unittest/mysys/my_atomic-t.c:
  factor out the common code for multi-threaded stress unit tests
  move lf tests to a separate file
unittest/mysys/thr_template.c:
  factor out the common code for multi-threaded stress unit tests
unittest/mysys/waiting_threads-t.c:
  wt tests
2008-07-29 16:10:24 +02:00
Chad MILLER
f6f6d81b82 Make community features (including profiling) on by default. 2008-07-24 13:43:14 -04:00
Jonathan Perkin
9ee2262c9d Raise version number after cloning 5.0.67 2008-07-16 18:07:16 +02:00
Jonathan Perkin
f81792945a Put version number back to 5.0.67 2008-07-16 17:47:30 +02:00
Chad MILLER
a4e7283a92 Merge from 5.0 trunk. 2008-07-14 16:16:37 -04:00
Chad MILLER
c425bf421d Merge chunk from trunk. 2008-07-10 14:50:07 -04:00
Chad MILLER
6a6e77eeff Merge chunk from trunk. 2008-07-10 14:47:53 -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