mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 23:04:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
56234 commits 2774 branches 343 tags 1.6 GiB
Commit graph

1488 commits

Author SHA1 Message Date
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