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
54784 commits 2784 branches 343 tags 1.6 GiB
Commit graph

661 commits

Author SHA1 Message Date
Chad MILLER
297593c5d3 Better fix of build-tags, merged from local 5.0-bugteam . 2008-08-06 16:45:15 -04:00
Chad MILLER
b94519a154 Bug#37201: make tags doesn't work in bazaar server trees 
Fall back to "find" if bzr is unavailable.

Don't fail for paths that have spaces in them.
 2008-08-06 16:25:25 -04:00
Chad MILLER
17badbd9a5 Merge from local 5.0-bugteam. 2008-08-06 15:29:41 -04:00
Chad MILLER
15beb38f9f Bug#37201: make tags doesn't work in bazaar server trees 
bk sfiles -> bzr ls
 2008-08-06 15:27:28 -04:00
Timothy Smith
6e8eaa8e21 Up-merge of merges, some criss-cross resolved with --weave. 2008-07-19 02:31:33 -06:00
Jonathan Perkin
2244456ddf Use skip-federated by default in all example configs. 2008-06-10 21:10:56 +02:00
kent/mysqldev@mysql.com/production.mysql.com
9b6ac078f6 Makefile.am: 
Add ChangeLog if it exists
  - Removed separate 'normal+rowrepl' test run, not needed any longer
  - Removed separate 'rpl' test run, included in main test run already
  - Renamed some test "comments", to use similar naming style
  - Limited one of the Cluster test runs to 'ndb' and 'rpl_ndb' suites
  - Reordered test runs, to be aligned with Windows test runs
mysql.spec.sh:
  - No longer including the "Example" storage engine
  - Added to configure "--without-ENGINE" if not to compile engine as plugin
 2008-04-08 11:44:18 +02:00
kent/mysqldev@mysql.com/production.mysql.com
c41a4e13f8 mysql.spec.sh: 
If excluding Federated, make sure dynamic plugin is not built
Makefile.am:
  Only run cluster test when compiled with cluster
lib_sql.cc:
  Work around for Visual Studio 2003, that lacks vsnprintf() but has _vsnprintf()
 2008-04-02 22:24:53 +02:00
kent/mysqldev@mysql.com/production.mysql.com
bf92d91e1e mysql.spec.sh: 
Made Federated and Cluster optional
 2008-03-31 19:48:54 +02:00
cmiller@zippy.cornsilk.net
75da480f85 Merge bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build
 2008-03-26 14:30:26 -04:00
cmiller@zippy.cornsilk.net
3af3e6963b Merge bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-03-26 14:24:10 -04:00
cmiller@zippy.cornsilk.net
cfb9c8458e Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-build 
into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-build
 2008-03-26 12:39:22 -04:00
cmiller@zippy.cornsilk.net
897f772c14 Suggestion of Tim. Avoid unnecessary sleep. 2008-03-19 18:36:41 -04:00
cmiller@zippy.cornsilk.net
955983a154 Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \ 
isn't running

Pass the process id of the manager as a parameter to "wait_for_pid"
and if the manager isn't running, then do not continue to wait.

Also, capture the error message of our process-existence test, 
"kill -0", as we expect errors and shouldn't pass them to the user.  
Additionally, be a bit more descriptive of what the problem is.
 2008-03-19 18:13:56 -04:00
tsmith@ramayana.hindu.god
79365b94c8 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-03-19 14:59:48 -06:00
tsmith@ramayana.hindu.god
c4ee11bac6 Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-03-19 14:57:35 -06:00
tsmith@ramayana.hindu.god
1f06d215e7 Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-03-19 14:49:28 -06:00
tsmith@ramayana.hindu.god
203de67618 Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/50
 2008-03-19 13:44:50 -06:00
joerg@trift2.
25c9fd5961 Merge trift2.:/MySQL/M50/man8-5.0 
into  trift2.:/MySQL/M51/man8-5.1
 2008-03-19 19:59:08 +01:00
joerg@trift2.
9ece3ac2df Merge trift2.:/MySQL/M41/man8-4.1 
into  trift2.:/MySQL/M50/man8-5.0
 2008-03-19 19:42:59 +01:00
joerg@trift2.
d4e7bf8709 support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd". 2008-03-19 19:13:28 +01:00
tsmith@ramayana.hindu.god
1cda9d124b Bug #25486: mysqld_multi.server.sh missing from builds 
Make mysqld_multi.server executable, and allow it to be installed
via chkconfig on LSB-compliant systems.
 2008-03-10 03:25:54 -06: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@mysql.com/kent-amd64.(none)
ac15eee942 Makefile.am, Info.plist.sh: 
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot
misc.m4, character_sets.m4, openssl.m4:
  Removed unneded semicolon
 2008-02-26 18:36:06 +01:00
joerg@trift2.
25ab6afc03 Merge trift2.:/MySQL/M51/mysql-5.1 
into  trift2.:/MySQL/M51/push-5.1
 2008-02-22 16:14:27 +01:00
tsmith@ramayana.hindu.god
732eb0b4ce Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50 
into  ramayana.hindu.god:/home/tsmith/m/bk/build/51
 2008-02-18 12:18:36 -07:00
tsmith@ramayana.hindu.god
69dcac5a7e Bug #28555 Upgrading MySQL Fails to shut down old server and kills socket file 
Check for an existing MySQL server package from a different vendor or
major MySQL version.  In such a case, refuse to install the server and
recommend how to safely remove the old packages before installing the
new ones.
 2008-02-18 12:03:39 -07:00
tomas@poseidon.ndb.mysql.com
832b498e72 Merge poseidon.ndb.mysql.com:/home/tomas/cge-5.1 
into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge
 2008-02-11 17:38:34 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
c8d4323975 Makefile.am: 
Needed to add the new sample configuration files to the CLEANFILES section
 2008-01-24 19:04:48 +01:00
jmiller/ndbdev@mysql.com/ndb15.mysql.com
9803176bd1 config.medium.ini.sh, config.small.ini.sh, config.huge.ini.sh: 
Sample cluster configuration files for 5.1
Makefile.am:
  Updated for new files
 2008-01-23 20:45:46 +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@mysql.com/kent-amd64.(none)
ec2e2fc187 ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE: 
Updated links to version 5.1 of the manual
 2007-11-23 10:15:55 +01:00
df@pippilotta.erinye.com
8c88e1faa2 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-11-21 19:42:50 +01:00
df@pippilotta.erinye.com
cf7b21c005 add wrong warning to suppression file 2007-11-21 19:41:13 +01:00
df@pippilotta.erinye.com
ca249707a1 Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build 
into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
 2007-11-21 19:33:27 +01:00
df@pippilotta.erinye.com
c25cbcec13 ignore readline warnings 2007-11-21 18:11:08 +01:00
joerg@trift2.
9ffd927e7d In the "spec" file for RPM builds, handle the debug server tests different from the standard server. 2007-11-16 17:36:13 +01:00
kent@kent-amd64.(none)
8a20af716a Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-build 
into  mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
 2007-11-08 18:16:58 +01:00
kent@kent-amd64.(none)
9978cb97de Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build 
into  mysql.com:/home/kent/bk/bug25205/mysql-5.1-build
 2007-11-08 18:12:06 +01:00
jperkin@production.mysql.com
56f6caaa13 Merge production.mysql.com:/usersnfs/jperkin/bk/bug-27995/5.0 
into  production.mysql.com:/usersnfs/jperkin/bk/build/5.1
 2007-11-05 18:01:45 +01:00
jperkin@production.mysql.com
51be103e13 Provide better feedback to the user when unable to find MySQL files 
usually caused by a bad basedir setting.
 2007-11-05 17:48:11 +01:00
kent@mysql.com/kent-amd64.(none)
d3894dad60 Merge mysql.com:/home/kent/bk/bug25205/mysql-5.0-build 
into  mysql.com:/home/kent/bk/bug25205/mysql-5.1-build
 2007-11-02 13:04:52 +01:00
kent@mysql.com/kent-amd64.(none)
ee295affba Makefile.am: 
Added manual.chm to EXTRA_DIST
  Removed install of INSTALL-BINARY, handled
  by install scripts.
ReadMe.txt, INSTALL-WIN-SOURCE, INSTALL-BINARY, INSTALL-SOURCE:
  Updated links to version 5.0 of the manual
 2007-11-02 12:59:45 +01:00
kent@mysql.com/kent-amd64.(none)
3a5a151a86 Merge mysql.com:/home/kent/bk/bug25205/mysql-4.1-build 
into  mysql.com:/home/kent/bk/bug25205/mysql-5.0-build
 2007-11-02 12:44:48 +01:00
kent@mysql.com/kent-amd64.(none)
aacb5fa447 Merge mysql.com:/home/kent/bk/bug25205/mysql-4.0 
into  mysql.com:/home/kent/bk/bug25205/mysql-4.1-build
 2007-11-02 12:33:16 +01:00
kent@mysql.com/kent-amd64.(none)
fe129ce235 mysql.info, INSTALL-BINARY, INSTALL-SOURCE, ReadMe.txt, Docs/Makefile.am: 
Let place holders for real documentation have text that
  makes sense to the user (Bug#25205)
 2007-11-02 12:29:13 +01: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
mtaylor@solace.(none)
f6ba3443e8 Removing 7 year old 3.23 crufty debian dir that is not in use, so as not to cause confusion. 2007-10-12 13:07:39 -07:00
kent@mysql.com/kent-amd64.(none)
e5ad2cdd58 Makefile.am, make_binary_distribution.sh: 
Use custom 'pkgduppdir'
mysql.server.sh:
  The server is installed in 'libexecdir'
 2007-09-27 12:21:56 +02:00