mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-20 05:52:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
58502 commits 2784 branches 343 tags 1.6 GiB
Commit graph

1588 commits

Author SHA1 Message Date
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
tnurnberg@sin.intern.azundris.com
8dd4751be9 Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2 
mysqld hasn't been built on AIX with ndb-everything in quite a while.
this allowed a variety of changes to be added that broke the AIX build
for both the GNU and IBM compilers (but the IBM suite in particular).
Changeset lets build to complete on AIX 5.2 for users of the GNU and
the IBM suite both. Tudo bem?
 2007-08-01 04:56:58 +02:00
kent@kent-amd64.(none)
fd3b865149 Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build 
into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build
 2007-07-30 21:45:06 +02:00
kent@mysql.com/kent-amd64.(none)
a9d2569cba Generate "config.h" directly into the "include" directory, later copied 
to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.
 2007-07-30 21:09:45 +02:00
monty@mysql.com/nosik.monty.fi
a33c863ffd Add 'extension' field to all client library structures to make them extensible 
Reorder structure elements to make structures smaller and faster on 64 bit systems
This is a first step in cleaning up the client include files (but should be enough to allow us to do future fixes without breaking the library)
This change is part of WL#2872,  Make client library extensible.
 2007-07-30 06:22:25 +03:00
kent@mysql.com/kent-amd64.(none)
0886cc3bed Many files: 
Put back old code to check stack direction at configure time
 2007-07-23 23:54:55 +02:00
joerg@trift-lap.fambruehe
f4e73e7cc7 Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-07-16 19:06:11 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
c04ae188f5 Raise version number after cloning 5.0.46 2007-07-16 12:42:12 +02:00
cmiller@zippy.cornsilk.net
681ee9694b Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
 2007-07-02 10:46:46 -04:00
istruewing@synthia.local
0fa5fe24a7 Merge synthia.local:/home/mydev/mysql-5.1-amain 
into  synthia.local:/home/mydev/mysql-5.1-axmrg
 2007-06-30 00:45:24 +02:00
df@pippilotta.erinye.com
5aa0716817 Merge dev:/data0/mysqldev/my/build-200706140748-5.0.44/mysql-5.0-release 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
 2007-06-29 12:19:38 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
5651ce23d4 Raise version number after cloning 5.1.20-beta 2007-06-25 15:04:31 +02:00
joerg@trift2.
79677b756e Merge trift2.:/MySQL/M50/clone-5.0 
into  trift2.:/MySQL/M51/push-5.1
 2007-06-25 13:22:34 +02:00
kent/mysqldev@mysql.com/production.mysql.com
2418b85046 configure.in: 
Added --with-system-type=<systype> and --with-machine-type=<machtype>
  options, to be able to override the one detected, for --version strings
field.cc, field.h, listener.cc:
  C++ compatibility change for IBM VisualAge 6 and i5/OS
 2007-06-20 14:00:28 +02:00
df@pippilotta.erinye.com
f927d50509 try again. 2007-06-19 12:03:10 +02:00
tsmith@maint1.mysql.com
b6bd61d4d4 Merge maint1.mysql.com:/data/localhome/tsmith/bk/41 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/41
 2007-06-18 22:10:54 +02:00
tsmith@maint1.mysql.com
a9ae34b56c Merge quadxeon:m/srv/quadxeon/local/bk/maint/jun14/50 
into  maint1.mysql.com:/data/localhome/tsmith/bk/maint/51
 2007-06-15 18:56:11 +02:00
tsmith@quadxeon.mysql.com
73035c274f Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-15 17:59:04 +02:00
tsmith@quadxeon.mysql.com
918090030b Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/51
 2007-06-15 01:57:33 +02:00
cmiller@zippy.cornsilk.net
85caa3540e Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-06-14 18:17:26 -04:00
tsmith@quadxeon.mysql.com
87fdad4ce8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/jun14/50
 2007-06-14 23:23:30 +02:00
cmiller@zippy.cornsilk.net
d37e579411 Bug#21723: Should be able to dump core after setuid() under Linux 
In many cases, binaries can no longer dump core after calling setuid().

Where the PR_SET_DUMPABLE macro is set, use the prctl() system call 
to tell the kernel that it's allowed to dump the core of the server.
 2007-06-14 14:24:59 -04:00
cmiller@zippy.cornsilk.net
e6cb98adb2 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-06-08 17:10:51 -04:00
msvensson@pilot.(none)
f8c036a052 Merge pilot.(none):/data/msvensson/mysql/mysql-5.0-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint
 2007-06-07 09:22:26 +02:00
msvensson@pilot.(none)
7368985cfa Merge pilot.(none):/data/msvensson/mysql/mysql-4.1-maint 
into  pilot.(none):/data/msvensson/mysql/mysql-5.0-maint
 2007-06-07 09:21:33 +02:00
joerg@trift2.
fef905d0bf Merge trift2.:/MySQL/M41/mysql-4.1 
into  trift2.:/MySQL/M41/push-4.1
 2007-06-06 16:05:23 +02:00
joerg/mysqldev@mysql.com/production.mysql.com
0067a9cc02 Raise version number after cloning 4.1.23 2007-06-06 15:22:06 +02:00
msvensson@pilot.(none)
5df790445a Bug#10218 Command line recall rolls into Segmentation Fault(coredump)' 
- Declare 'tgoto' if not already declared in system header files.
 2007-06-04 16:42:42 +02:00
joerg@debian.(none)
81930fc4bf Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1 
into  debian.(none):/M51/merge-5.1
 2007-06-01 12:59:06 +02:00
kent@kent-amd64.(none)
05c5139854 Merge mysql.com:/home/kent/bk/tmp3/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.1-build
 2007-05-30 22:18:45 +02:00
kent@kent-amd64.(none)
a1f0ff4bb4 Merge mysql.com:/home/kent/bk/tmp3/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build
 2007-05-30 22:15:13 +02:00
kent@mysql.com/kent-amd64.(none)
b217a9e898 Makefile.am, configure.in: 
Added --with-mysqld-libs configure flag
 2007-05-30 22:11:53 +02:00
kent@mysql.com/kent-amd64.(none)
1d36bcab1d configure.in: 
After merge changes, removed unneeded Netware specific sprintf case
 2007-05-28 22:14:29 +02:00
kent@mysql.com/kent-amd64.(none)
a069db06a6 sql_parse.cc, config-win.h, config-netware.h: 
Don't try determine stack direction at configure time
compiler_flag.m4:
  Use AC_TRY_COMPILE and AC_TRY_LINK instead of AC_TRY_RUN where possible
misc.m4, configure.in:
  Use fourth argument to AC_TRY_RUN, to be used in cross compilation
  Don't try determine stack direction at configure time
 2007-05-27 23:21:03 +02:00
jbruehe/mysqldev@mysql.com/production.mysql.com
7034295f79 Raise version number after cloning 5.1.19-beta 2007-05-24 17:35:22 +02:00
tsmith@quadxeon.mysql.com
99488b31b9 Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 
into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
 2007-05-21 20:50:08 +02:00
tsmith@siva.hindu.god
4a4590cd49 Merge siva.hindu.god:/home/tsmith/m/bk/51 
into  siva.hindu.god:/home/tsmith/m/bk/maint/51
 2007-05-17 14:21:35 -06:00
msvensson@pilot.blaudden
47d3829f0b Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype 
- Since isinf() portability across various platforms and
  compilers is a complicated question, we should not use
  it directly. Instead, the my_isinf() macro should be used,
  which is defined as an alias to the system-defined isinf()
  if it is safe to use, or a workaround implementation otherwise
 2007-05-16 10:10:02 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
c4cbae6eef Raise version number after cloning 5.0.42 2007-05-14 14:59:23 +02:00
kaa@polly.local
722b690743 Merge polly.local:/home/kaa/src/maint/bug28240/my50-bug24240 
into  polly.local:/home/kaa/src/maint/bug28240/my51-bug24240
 2007-05-10 17:07:27 +04:00
cmiller@zippy.cornsilk.net
cabd54591f Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-05-08 18:20:34 -04:00
cmiller@zippy.cornsilk.net
dc406f2dad Bug #23294: Detection of sem_xxx functions on NetBSD broken and \ 
DragonflyBSD misc patches

The bug reporter anticipated a problem, instead of experiencing one.

IRC conversation:
<xtraeme> sem_init is defined in librt on NetBSD
	solaris uses libposix4 iirc
	that's why I sent a patch
<chadmiller> xtraeme: Agreed.  But, AFAICT, mysql doesn't use 
	sem_init() anywhere.  Thus my confusion.
<xtraeme> I didn't verify that, but I saw that sem_init wasn't detected 
	correctly...
	why are you checking for sem_init if it's unused then? :-)
<chadmiller> xtraeme: In recent autoconf scripts, we change it to test 
	for sched_yield() .
<xtraeme> that's ok then
	sched_yield is in libc
	feel free to close the bug report then :-)
 2007-05-08 18:19:36 -04:00
kaa@polly.local
51af6a4077 Fix for bug #28240: "isinf()" cannot be used in C++ for lack of prototype 
Since isinf() portability across various platforms and compilers is a complicated question, we should not use it directly. Instead, the my_isinf() macro should be used, which is defined as an alias to the system-defined isinf() if it is safe to use, or a workaround implementation otherwise.
 2007-05-08 21:11:46 +04:00
cmiller@zippy.cornsilk.net
50c89e7ae1 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
 2007-05-08 09:20:36 -04:00
cmiller@zippy.cornsilk.net
53d5c7e55d Bug #23294: Detection of sem_xxx functions on NetBSD broken and \ 
DragonflyBSD misc patches

Add the original intended test, since our current test for sched_yield
is insufficient to copy.
 2007-05-08 09:18:51 -04:00
cmiller@zippy.cornsilk.net
3d256e5b75 Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community--bug23294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
 2007-05-08 09:12:14 -04:00
jbruehe/mysqldev@mysql.com/production.mysql.com
7357712fda Raise version number after cloning 5.1.18-beta 2007-05-08 11:16:41 +02:00
cmiller@zippy.cornsilk.net
79d652408d Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unification
 2007-05-07 16:59:03 -04:00
df@pippilotta.erinye.com
f3c5627a79 raise version number 2007-05-07 19:48:11 +02:00
cmiller@zippy.cornsilk.net
90c29789e4 Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2007-05-04 12:02:00 -04:00
cmiller@zippy.cornsilk.net
587290cf00 Fix up merge. Some macros are now functions. Some functions are 
renamed.  Some new THD proc_info states are new.  Directories must be
encountered in make in a specific order, to have symlinks already set.
Move community-server-specific tests into own tests, so that we can 
exempt them from testing on enterprise servers.
 2007-05-02 14:13:33 -04:00
cmiller@zippy.cornsilk.net
71a0ecee6e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-unified02
 2007-04-27 16:45:01 -04:00
cmiller@zippy.cornsilk.net
c9cbc1e7f3 Merge mysqldev@production.mysql.com:my/mysql-5.0-release 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
 2007-04-26 11:51:37 -04:00
joerg@trift-lap.fambruehe
2ed383302f Merge trift-lap.fambruehe:/MySQL/M50/mysql-5.0 
into  trift-lap.fambruehe:/MySQL/M50/push-5.0
 2007-04-26 16:06:44 +02:00
joerg@trift-lap.fambruehe
f723388b18 Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1 
into  trift-lap.fambruehe:/MySQL/M51/push-5.1
 2007-04-26 16:03:02 +02:00
cmiller@zippy.cornsilk.net
9dd7812fec Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community-formerge51 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-enterprise-formergecomm
 2007-04-25 08:14:46 -04:00
cmiller@zippy.cornsilk.net
93e804a616 Wrap code specific to the comunity-server in additional CPP #ifdef . 
Add a new autoconf paremeter --{en,dis}able-community-features .  The
default is disable for enterprise servers.

Though this is a 5.0 tree, it is only to be merged into the 5.0-community
tree and the global 5.1 tree, never to the 5.0-enterprise tree.
 2007-04-24 18:11:55 -04:00
cmiller@zippy.cornsilk.net
db6eab9bfa Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2007-04-24 10:46:39 -04:00
msvensson@pilot.blaudden
2ac94c30f4 Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-23 17:01:02 +02:00
joerg@debian.(none)
94008df3e0 Merge debian.(none):/M51/mysql-5.1 
into  debian.(none):/M51/push-5.1
 2007-04-23 11:21:15 +02:00
cmiller@zippy.cornsilk.net
a602c2c78e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community--bug23294 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-new-maint
 2007-04-21 09:42:18 -04:00
mtaylor@qualinost.(none)
e593503303 Branched for 5.1 2007-04-20 14:49:47 -07:00
joerg@debian.(none)
88d88e7f7a Merge debian.(none):/M50/bug27739-5.0 
into  debian.(none):/M50/push-5.0
 2007-04-20 12:25:50 +02:00
joerg@debian.(none)
cd8359720e Merge debian.(none):/M50/bug27739-5.0 
into  debian.(none):/M51/bug27739-5.1
 2007-04-20 11:03:13 +02:00
joerg@debian.(none)
5de73f45f9 configure.in : Ensure that "icheck" is really the ABI checker, 
not some other tool (file system checker on Tru64).

Patch originally supplied by Peter O'Gorman, slightly modified by me.

Bug#27739 "build fails on Tru64 due to icheck test in configure"
 2007-04-20 10:51:53 +02:00
mats@romeo.(none)
875de0e571 Merge romeo.(none):/home/bkroot/mysql-5.1-rpl 
into  romeo.(none):/home/bk/merge-mysql-5.1
 2007-04-20 10:46:58 +02:00
mtaylor@qualinost.(none)
9625810b51 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
 2007-04-18 14:37:01 -07:00
mtaylor@qualinost.(none)
62b976d38d Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
 2007-04-18 14:35:15 -07:00
mtaylor@qualinost.(none)
f9d8b39bc5 Fixed make distcheck problem. 2007-04-18 14:34:38 -07:00
joerg@debian.(none)
9aa59cb934 Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  debian.(none):/M50/push-5.0
 2007-04-18 13:11:17 +02:00
mtaylor@qualinost.(none)
c9419c608e Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.1-new-maint
 2007-04-17 21:36:32 -07:00
mtaylor@qualinost.(none)
587cc24f71 Merge qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint-debianv2 
into  qualinost.(none):/home/mtaylor/src/mysql/mysql-5.0-maint
 2007-04-17 19:08:24 -07:00
mtaylor@qualinost.(none)
e208ce21de BUG#27769 - MySQL should include debian packaging dir 
Replaced hardcoded sover reference with variable.
Removed references to added manpages.
---
BUG#27769 
Cleaned up some things to make building the packages go a little smoother. 
---
debian/rules really does need to be called from the source root.
---
Fixed two problems with the build caused by adding debian to the source tree
---
Left off the debian/ prefix to the Makefile filter.
---
BUG#27769 - MySQL should include debian packaging dir
Changed substitution variables to match already existing autoconf vars.
Generate debian/control and debian/defs.mk from autoconf now, since we run that
to make a source package. 
---
Corrected incorrect variable name
---
Renamed template files to have shorter names. 
---
Moved generation of debian/control to dist-hook so make clean won't eat it.
---
A few final changes to make debs build from a source tarball dist.
 2007-04-17 18:12:43 -07:00
tsmith@siva.hindu.god
5e75e31268 Merge siva.hindu.god:/home/tsmith/m/bk/50 
into  siva.hindu.god:/home/tsmith/m/bk/maint/50
 2007-04-17 15:40:13 -06:00
kent/mysqldev@mysql.com/production.mysql.com
c43a7b9bf7 Raise version number after cloning 5.0.40 2007-04-17 15:22:48 +02:00
joerg@trift2.
7139131674 Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M51/limit-man-5.1
 2007-04-17 14:45:21 +02:00
joerg@trift2.
e7788a9f1b Cleanup: The temporary file could be left around if nothing was excluded. 2007-04-17 14:41:07 +02:00
joerg@trift2.
6feaf3c726 Merge trift2.:/MySQL/M50/limit-man-5.0 
into  trift2.:/MySQL/M51/limit-man-5.1

Fixes during manual merge, due to the "plugin" naming of configure variables in 5.1
 2007-04-17 12:43:02 +02:00
joerg@trift2.
8437fd62b2 Let the "configure" options that control table handlers (NDB, InnoDB) or features ("embedded") 
also control the list of man pages installed, so that they correspond better to the binaries.

This is the second version of this fix, including review comments.
 2007-04-17 12:18:17 +02:00
tomas@whalegate.ndb.mysql.com
5ee4948dec Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-maint
 2007-04-16 14:51:55 +02:00
tomas@whalegate.ndb.mysql.com
a30755427a Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb 
into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-maint
 2007-04-16 14:51:08 +02:00
mtaylor@qualinost.(none)
48739d15f1 Merge qualinost.(none):/home/mtaylor/src/mysql-5.0-maint-debian 
into  qualinost.(none):/home/mtaylor/src/mysql-5.1-new-maint-debian
 2007-04-11 16:38:37 -07:00
mtaylor@qualinost.(none)
6547960e28 Adding files to support building for debian. 
---
Removed reference to debian svn location of debian dir. 
Changed verbage of comment to appease Timothy. 
---
Removed added manpages that aren't appropriate for our build. 
---
Added debian dir to list of dist targets. 
Added list of files needed to be distributed in debian dir.
---
Added semi-colons to fix syntax error.
---
BUG#27769 MySQL should include debian packaing dir
Added debian/Makefile to configure.in to support make dist.
 2007-04-11 16:13:09 -07:00
df@pippilotta.erinye.com
d09d2517cf Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work
 2007-04-11 13:37:05 +02:00
df@pippilotta.erinye.com
b51c346781 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work-36sp1 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build-work
 2007-04-11 13:31:28 +02:00
df@pippilotta.erinye.com
d5f6363ba1 make configure handle service pack version strings 2007-04-11 13:01:11 +02:00
hakank/hakan@lu0011.wdf.sap.corp
48b2d85708 Added comment about changing major version number. 2007-04-11 12:30:30 +02:00
msvensson@pilot.blaudden
2218fafa1f Merge pilot.blaudden:/home/msvensson/mysql/bug22508/my51-bug22508 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
 2007-04-11 09:34:02 +02:00
kent@mysql.com/kent-amd64.(none)
463b34e77b zlib.m4: 
Only require the more recent zlibCompileFlags() when
  building the server, client zlib don't need it.
Makefile.am:
  Always build the bundled zlib static only
configure.in:
  Look for dlopen() even if --with-mysqld-ldflags constains "-static",
  as this is not the same as the flag to "ld", it just informs
  "libtool" to link static with libraries created part of the build,
  even if there exists shared versions.
make_binary_distribution.sh:
  Real "mysqlmanager" executable might be in ".libs"
 2007-04-05 08:36:56 +02:00
cmiller@zippy.cornsilk.net
6204ae25fc Backport: 
B-g#27427: resolveip fails on hostnames with a leading digit

We need inet_aton for the extra/resolveip tool.  Some OSes put this
in nonstandard libraries.
 2007-04-04 07:44:12 -04:00
cmiller@zippy.cornsilk.net
5f4dfdd5fe Merge bk-internal.mysql.com:/home/bk/mysql-5.0 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-community
 2007-04-03 09:20:22 -04:00
kent@kent-amd64.(none)
0544355385 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-28 23:08:00 +02:00
kent@mysql.com/kent-amd64.(none)
7a2e0ee7d7 configure.in: 
Don't install ndb man pages if no ndb configured
config-win.h, CMakeLists.txt, README, configure.js:
  Removed Cybozu patches
 2007-03-28 23:00:50 +02:00
msvensson@pilot.blaudden
b554258a8e Bug#22508 BUILD/compile-dist fails due to problem with readline/libedit 
- Move the link_sources command from top level Makefile into each subdir
   that need to link files
 2007-03-27 23:56:48 +02:00
dfischer/mysqldev@mysql.com/production.mysql.com
b9a317de70 Raise version number after cloning 5.1.17-beta 2007-03-23 07:27:46 +01:00
jbruehe/mysqldev@mysql.com/production.mysql.com
6d99387502 Raise version number after cloning 5.0.38 2007-03-15 22:28:31 +01:00
kent@kent-amd64.(none)
ac91a4a89f Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-14 14:37:50 +01:00
kent@mysql.com/kent-amd64.(none)
201e58d14e Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-14 14:31:44 +01:00
kent@mysql.com/kent-amd64.(none)
6b72b54716 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-14 14:29:23 +01:00
kent@mysql.com/kent-amd64.(none)
be226152ab configure.in: 
Added test for sched_yield() possibly in -lposix4 on Solaris
 2007-03-14 14:27:46 +01:00
kent@kent-amd64.(none)
abde3576d6 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-12 21:29:48 +01:00
kent@mysql.com/kent-amd64.(none)
d6476788fe Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-12 21:29:05 +01:00
kent@mysql.com/kent-amd64.(none)
512202a88f configure.in: 
Restored accidently removed line to check for zlib
 2007-03-12 21:27:07 +01:00
kent@kent-amd64.(none)
9d396c6996 Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
 2007-03-12 13:29:11 +01:00
kent@mysql.com/kent-amd64.(none)
30537c7d75 Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build 
into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
 2007-03-12 13:22:02 +01:00
kent@mysql.com/kent-amd64.(none)
cad1c35618 Merge mysql.com:/home/kent/bk/tmp/mysql-4.0 
into  mysql.com:/home/kent/bk/tmp/mysql-4.1-build
 2007-03-12 13:15:11 +01:00
kent@mysql.com/kent-amd64.(none)
4e4f184170 Makefile.am, configure.in, mysys.dsp: 
Removed unused files
.del-my_winsem.c:
  Delete: mysys/my_winsem.c
.del-my_semaphore.c:
  Delete: mysys/my_semaphore.c
.del-my_semaphore.h:
  Delete: include/my_semaphore.h
 2007-03-12 13:12:42 +01:00
tsmith@bk-internal.mysql.com
8539d9a7bd The most recent push into mysql-5.1 from mysql-5.2 was a mistake. 
This just reverses those changes.  I'm really sorry about that.

configure.in, version.c:
  Reverse last push (from mysql-5.2 into mysql-5.1)
 2007-03-08 18:38:17 +01:00
tsmith/mysqldev@bk-internal.mysql.com
b887bfe1a4 Update version to 5.2.0-alpha - new 5.2 tree 2007-02-28 19:37:31 +01:00