Commit graph

1596 commits

Author SHA1 Message Date
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
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
kent@mysql.com/kent-amd64.(none)
b058fce73d configure.in:
Merged missing change in the 5.0 community repository, --without-server
  was not working if thread safe client was enabled (Bug#32898)
2007-12-06 10:23:58 +01:00
kent@mysql.com/kent-amd64.(none)
5caf347a56 configure.in:
Removed the auto detection and use of Solaris "libmtmalloc", as it
  cause regression on bug#18322. The code removed also prevented
  a build without using this library. Users can still compile with
  "libmtmalloc", if configuring with "--with-mysqld-libs=-lmtmalloc"
2007-12-04 20:27:08 +01:00
kent@kent-amd64.(none)
b60c1366ed Merge mysql.com:/home/kent/bk/docs-cleanup/mysql-5.0-build
into  mysql.com:/home/kent/bk/docs-cleanup/mysql-5.1-build
2007-11-22 17:53:47 +01:00
kent@mysql.com/kent-amd64.(none)
41778b565b Makefile.am, configure.in:
Include "manual.chm" in source TAR if it exists
2007-11-22 17:48:40 +01:00
jperkin/mysqldev@mysql.com/production.mysql.com
003f5640e7 configure.in:
Revert version back to 5.0.52 for release build
2007-11-21 14:27:35 +01:00
dfischer/mysqldev@mysql.com/production.mysql.com
4b94aec52a Raise version number after cloning 5.0.52 2007-11-20 11:26:16 +01:00
joerg/mysqldev@mysql.com/production.mysql.com
ac75abc223 Revert a premature version upgrade - this is 5.0.51 still. 2007-11-15 10:00:39 +01:00
cmiller@zippy.cornsilk.net
149581ecbb Merge bk-internal.mysql.com:/home/bk/mysql-5.1-community
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
2007-11-02 12:02:22 -04:00
istruewing@stella.local
88f66ce976 Merge stella.local:/home2/mydev/mysql-5.1-amain
into  stella.local:/home2/mydev/mysql-5.1-axmrg
2007-11-02 10:53:20 +01:00
joerg@trift2.
b41a047d5c 5.1 has been promoted to "rc" status. 2007-10-29 20:00:36 +01:00
cmiller@zippy.cornsilk.net
44ba122726 Remove easily-changed and prominent variable that toggled
community-server features.

Community server features should be fully integrated into 5.1, but
disabled by default.  We never toggle that they're disabled based
on the version number, in the 5.1 line and later.
2007-10-29 12:48:48 -04:00
cmiller@zippy.cornsilk.net
61621a9791 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1
2007-10-29 12:42:06 -04:00
antony@pcg5ppc.xiphis.org
ada0b49328 Bug#30296
"Dynamic plugins fail to load on FreeBSD"
  ELF executables need to be linked using the -export-dynamic option to
  ld(1) for symbols defined in the executable to become visible to dlsym().
  Also, do not build plugins on an all-static build.
2007-10-25 21:19:28 -07:00
joerg@trift2.
5e95b3c34c Merge trift2.:/MySQL/M51/bug31644-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-19 19:22:27 +02:00
joerg@trift2.
eee35f91f0 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-19 19:19:15 +02:00
joerg@trift2.
f3668c9f03 Merge trift2.:/MySQL/M50/bug31644-5.0
into  trift2.:/MySQL/M51/bug31644-5.1
2007-10-19 19:06:30 +02:00
joerg@trift2.
7af6d8bf05 Merge trift2.:/MySQL/M51/mysql-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-10-19 11:41:15 +02:00
joerg@trift2.
06b226658b Merge trift2.:/MySQL/M50/mysql-5.0
into  trift2.:/MySQL/M50/push-5.0
2007-10-19 11:18:15 +02:00
joerg@trift2.
a238d6e280 Modify "mysqlbug" ("scripts/mysqlbug.sh") so that it differs between the original
and the modified values of the compile-related variables used in "configure".

Make the necessary adjustments in "configure.in" and "scripts/Makefile.am".

This fixes bug#31644
   Values of *FLAGS that were used for building packages is missed in mysqlbug
2007-10-18 12:03:30 +02:00
cmiller@zippy.cornsilk.net
f3d77c1979 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-recentcommmerge
2007-10-17 14:05:43 -04:00
cmiller@zippy.cornsilk.net
c6b5c6af86 Further clean-up. 2007-10-17 13:03:08 -04:00
joerg@trift2.
8f60de6d94 Merge trift2.:/MySQL/M50/bug29658-5.0
into  trift2.:/MySQL/M51/bug29658-5.1
2007-10-15 20:08:57 +02:00
joerg@trift2.
9dfa790ffc Allow for different directories containing the "libc",
as it may well happen with 32- vs 64-bit Linux systems.

This patch was proposed immediately with the report of
Bug #29658  wrong test for static nss checking on linux, doesn't cover all platforms
2007-10-15 19:59:14 +02:00
mtaylor@solace.(none)
f31d2ab3c8 Merge solace.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
into  solace.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
2007-10-12 02:18:13 -07:00
mtaylor@solace.(none)
709bb3948c Removed debian dir. It was a mistake to embed it in the tree in the first place. 2007-10-12 02:15:32 -07:00
tsmith@ramayana.hindu.god
06c6fce750 Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-10-10 14:15:09 -06:00
cmiller@zippy.cornsilk.net
3cf16df04f Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
2007-10-10 08:47:05 -04:00
tsmith@ramayana.hindu.god
5a1284ccb2 Merge ramayana.hindu.god:/home/tsmith/m/bk/50
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-09-28 10:54:49 -06:00
kent@mysql.com/kent-amd64.(none)
96b62a5c13 Makefile.am, configure.in:
Handle pstack like other optional directories
  Check if a directory exists relative to $srcdir
2007-09-27 21:39:23 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
6257abbc83 Raise version number after cloning 5.0.50 2007-09-26 19:15:42 +02:00
kent@mysql.com/kent-amd64.(none)
1b53e4a547 Makefile.am:
Always include all sub directories in "make dist"
  Removed incorrect comment
configure.in:
  Unconditionally list make files in AC_CONFIG_FILES
  Removed 'thread_dirs', it is not used
  Minor cleanup
compile-dist:
  Simplified the configure line needed for "make dist" to get it all
zlib.m4, ssl.m4:
  Unconditionally list make files in AC_CONFIG_FILES
Makefile.am:
  Removed DIST_SUBDIRS not needed
  Don't copy soft links as files into source package
2007-09-26 18:47:55 +02:00
tnurnberg@sin.intern.azundris.com
f3b1822c7a Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into  mysql.com:/home/tnurnberg/15327/51-15327
2007-09-15 05:12:02 +02:00
tnurnberg@sin.intern.azundris.com
7451aaf48c Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  mysql.com:/home/tnurnberg/15327/50-15327
2007-09-15 04:45:20 +02:00
tnurnberg@sin.intern.azundris.com
d5174aad89 Merge mysql.com:/home/tnurnberg/15327/50-15327
into  mysql.com:/home/tnurnberg/15327/51-15327
2007-09-15 04:09:38 +02:00
tnurnberg@mysql.com/sin.intern.azundris.com
3c6ca8d6ed Bug #15327: configure: --with-tcp-port option being partially ignored
make sure that if builder configured with a non-standard (!= 3306)
default TCP port that value actually gets used throughout. if they
didn't configure a value, assume "use a sensible default", which
will be read from /etc/services or, failing that, from the factory
default. That makes the order of preference
- command-line option
- my.cnf, where applicable
- $MYSQL_TCP_PORT environment variable
- /etc/services (unless configured --with-tcp-port)
- default port (--with-tcp-port=... or factory default)
2007-09-13 16:19:46 +02:00
cmiller@zippy.cornsilk.net
cf74e43f15 Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
2007-09-10 08:06:27 -04:00
tsmith@ramayana.hindu.god
a009144d43 Merge ramayana.hindu.god:/home/tsmith/m/bk/51-target22-X
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/51
2007-08-27 18:41:29 -06:00
joerg@trift2.
783411911a Merge trift2.:/MySQL/M51/netware3-5.1
into  trift2.:/MySQL/M51/push-5.1
2007-08-27 14:02:45 +02:00
joerg@trift2.
cb279c906a Merge trift2.:/MySQL/M51/netware3-5.1
into  trift2.:/MySQL/M51/target-5.1.22
2007-08-27 13:53:23 +02:00
joerg@trift2.
e42afa010d More cleanup / fixing for NetWare:
1) "test_db.sql" is a plaintext file, no binary;
2) do not try to strip the binaries, it will not work.
2007-08-27 13:30:22 +02:00
df@pippilotta.erinye.com
0670af9479 adjust version number 2007-08-27 11:38:32 +02:00
joerg@trift2.
8fbb89e831 Raise the version number to 5.1.23,
because we already split off a tree for 5.1.22 to receive only selected fixes.
2007-08-22 17:32:35 +02:00
joerg@trift2.
e33ff1c708 Fix the version number. 2007-08-22 15:58:03 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
b3db1d49eb Set back version number after pulling bugfix 2007-08-16 18:45:42 +02:00
monty@narttu.mysql.fi
9d609a59fd Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into  mysql.com:/home/my/mysql-5.1
2007-08-14 00:22:34 +03:00
monty@mysql.com/nosik.monty.fi
e53a73e26c Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris
Faster thr_alarm()
Added 'Opened_files' status variable to track calls to my_open()
Don't give warnings when running mysql_install_db
Added option --source-install to mysql_install_db

I had to do the following renames() as used polymorphism didn't work with Forte compiler on 64 bit systems
index_read()      -> index_read_map()
index_read_idx()  -> index_read_idx_map()
index_read_last() -> index_read_last_map()
2007-08-13 16:11:25 +03:00
jbruehe/mysqldev@mysql.com/production.mysql.com
0afb19f555 Raise version number after cloning 5.1.21-beta 2007-08-06 21:11:09 +02:00
df@pippilotta.erinye.com
493634e4c7 Merge bk-internal:/home/bk/mysql-5.1-marvel
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-marvel-engines
2007-08-03 17:15:23 +02:00
tsmith@ramayana.hindu.god
33c4cdaa66 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build
into  ramayana.hindu.god:/home/tsmith/m/bk/maint/50
2007-08-01 18:30:55 -06:00
tnurnberg@sin.intern.azundris.com
661c97a154 Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into  sin.intern.azundris.com:/home/tnurnberg/10776/50-10776
2007-08-01 09:32:33 +02:00