df@kahlann.erinye.com
9fe01abcca
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build
...
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work
2007-01-31 18:54:15 +01:00
joerg@trift2.
852321c7f8
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-01-31 18:20:23 +01:00
df@kahlann.erinye.com
beb265b2fe
MTR_BUILD_THREAD=auto for test runs during RPM build
2007-01-31 18:18:44 +01:00
joerg@trift2.
cd16ad87a2
Merge trift2.:/MySQL/M50/bug12676-5.0
...
into trift2.:/MySQL/M50/push-5.0
2007-01-31 18:16:51 +01:00
kent@kent-amd64.(none)
f8c66fe926
Merge mysql.com:/home/kent/bk/tmp2/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp2/mysql-5.1-build
2007-01-31 00:30:53 +01:00
kent@mysql.com/kent-amd64.(none)
e580bd6c6f
gen_lex_hash.cc:
...
If inserting a GPL header, include a complete one
Makefile.am, mysql.dsw, mysql.sln:
Removed C version of mysql-test-run
mysql.spec.sh:
Specify GPL license only in GPL sources
.del-my_manage.h:
Delete: mysql-test/my_manage.h
mysql.spec.sh:
Added GPL header
.del-mysql_test_run_new.c:
Delete: mysql-test/mysql_test_run_new.c
.del-mysql_test_run_new.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new.dsp
.del-my_create_tables.c:
Delete: mysql-test/my_create_tables.c
.del-mysql_test_run_new_ia64.dsp:
Delete: VC++Files/mysql-test/mysql_test_run_new_ia64.dsp
msql2mysql.sh:
Use up-to-date GPL header
.del-mysql_test_run_new.vcproj:
Delete: VC++Files/mysql-test/mysql_test_run_new.vcproj
.del-my_manage.c:
Delete: mysql-test/my_manage.c
2007-01-31 00:06:42 +01:00
kent@mysql.com/kent-amd64.(none)
de8654e534
mysql.spec.sh:
...
Added man page mysql_install_db.1
2007-01-30 22:40:30 +01:00
monty@mysql.com/narttu.mysql.fi
1f6d91c5a6
after merge fixes
...
Removed
2007-01-29 16:13:18 +02:00
monty@mysql.com/narttu.mysql.fi
410fc81a72
After merge fixes
...
Removed a lot of compiler warnings
Removed not used variables, functions and labels
Initialize some variables that could be used unitialized (fatal bugs)
%ll -> %l
2007-01-29 01:47:35 +02:00
df@kahlann.erinye.com
199f7b46b6
fix order in spec file changelog
2007-01-27 12:46:20 +01:00
monty@narttu.mysql.fi
8a80e36ac3
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
Merge of 'remove compiler warnings when using -Wshadow'
2007-01-27 03:46:45 +02:00
joerg@trift2.
32e83a6c3d
For Linux systems running RHEL 4 (which includes SE-Linux), we need to provide
...
additional files that specify some actions which are allowed to the MySQL binaries.
Create a new subdirectory "supportfiles/RHEL4-SElinux" for them, and process it.
This fixes bug#12676.
2007-01-25 17:51:21 +01:00
monty@mysql.com/narttu.mysql.fi
807526ff79
Fixed compiler warnings
...
Fixed wrong merge that disabled 'make test'
Renamed all suppress files to end in '.supp'
Don't give "skipped %d bytes from file" warnings in 5.0
2007-01-22 15:52:15 +02:00
joerg@trift2.
759b66479c
Merge trift2.:/MySQL/M50/tmp1-5.0
...
into trift2.:/MySQL/M51/push-5.1
2007-01-11 20:20:43 +01:00
jani/jamppa@bk-internal.mysql.com
e2fbd70fb1
Merge bk-internal.mysql.com:/data0/bk/mysql-5.0
...
into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
2007-01-11 16:42:48 +01:00
jani@ua141d10.elisa.omakaista.fi
30502c0e01
New file for autopush. To disable (known) compiler warnings.
2007-01-10 19:05:13 +02:00
joerg@trift2.
b63c167f66
support-files/MySQL-shared-compat.spec.sh : Dummy, irrelevant change - just trigger a new build.
2007-01-10 00:36:41 +01:00
joerg@trift2.
68d6f7ae52
Changes necessary to build version 4.0.28:
...
- "make_binary_distribution" accepts a dummy "--platform=" argument.
- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.
2007-01-08 18:33:55 +01:00
kent@kent-amd64.(none)
1a0e36ea6d
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
2007-01-05 17:30:40 +01:00
kent@mysql.com/kent-amd64.(none)
fa5a359f07
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
...
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
2007-01-05 16:57:23 +01:00
kent@mysql.com/kent-amd64.(none)
528b457644
mysql.spec.sh, make_binary_distribution.sh:
...
Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
correct "libgcc.a" path is returned for the 32/64 bit architecture
2007-01-05 16:53:03 +01:00
kent@kent-amd64.(none)
58763e383e
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-31 01:32:21 +01:00
kent@mysql.com/kent-amd64.(none)
6523aca729
my_strtoll10-x86.s:
...
Corrected spelling in copyright text
Makefile.am:
Don't update the files from BitKeeper
Many files:
Removed "MySQL Finland AB & TCX DataKonsult AB" from copyright header
Adjusted year(s) in copyright header
Many files:
Added GPL copyright text
Removed files:
Docs/Support/colspec-fix.pl
Docs/Support/docbook-fixup.pl
Docs/Support/docbook-prefix.pl
Docs/Support/docbook-split
Docs/Support/make-docbook
Docs/Support/make-makefile
Docs/Support/test-make-manual
Docs/Support/test-make-manual-de
Docs/Support/xwf
2006-12-31 01:02:27 +01:00
kent@kent-amd64.(none)
be15e3bc15
Merge mysql.com:/home/kent/bk/main/mysql-5.0
...
into mysql.com:/home/kent/bk/main/mysql-5.1
2006-12-23 20:20:40 +01:00
kent@mysql.com/kent-amd64.(none)
226a5c833f
Many files:
...
Changed header to GPL version 2 only
2006-12-23 20:17:15 +01:00
joerg@trift2.
c011b2e70f
Merge trift2.:/MySQL/M50/push-5.0
...
into trift2.:/MySQL/M51/push-5.1
2006-12-18 11:59:14 +01:00
joerg@trift2.
534b2ca0a8
support-files/mysql.spec.sh
...
Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
2006-12-18 11:51:45 +01:00
joerg@trift2.
436aa807fb
Merge trift2.:/MySQL/M50/spec-5.0
...
into trift2.:/MySQL/M51/spec-5.1
2006-12-14 22:45:06 +01:00
joerg@trift2.
a62051b77c
support-files/mysql.spec.sh
...
The "mysqlmanager" man page got moved from section 1 to 8.
2006-12-14 22:41:26 +01:00
joerg@trift2.
8bdcf736bb
Merge trift2.:/MySQL/M41/spec-4.1
...
into trift2.:/MySQL/M50/spec-5.0
2006-12-14 22:37:13 +01:00
joerg@trift2.
5582d60177
support-files/mysql.spec.sh
...
The Docs team has two new manpages for the "server" RPM: "my_print_defaults" and "mysql_tzinfo_to_sql".
2006-12-14 22:30:32 +01:00
msvensson@neptunus.(none)
971c783f7d
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
2006-12-04 19:11:55 +01:00
joerg@trift2.
1801033139
support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_datadir}" (bug#24182).
2006-11-30 11:03:49 +01:00
msvensson@neptunus.(none)
0e4d97edf0
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-23 18:38:27 +01:00
msvensson@neptunus.(none)
c76adf6021
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-release
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
2006-11-23 11:57:18 +01:00
msvensson@neptunus.(none)
dc9c3b5ad6
Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
2006-11-17 14:45:08 +01:00
hartmut@walhalla.site
f4e097420a
This command is not portable, as POSIX does not require it; use . instead.
...
(Bug #24294 )
2006-11-16 23:39:02 +01:00
joerg@trift2.
43cd9427e2
Merge trift2.:/MySQL/M50/bug22081-5.0
...
into trift2.:/MySQL/M51/bug22081-5.1
2006-11-16 15:16:51 +01:00
joerg@trift2.
818f3fa21f
Merge trift2.:/MySQL/M41/bug22081-4.1
...
into trift2.:/MySQL/M50/bug22081-5.0
2006-11-16 14:38:15 +01:00
joerg@trift2.
29dd8d2e58
support-files/mysql.spec.sh : Add an "Obsoletes" note relative to SuSE RPMs (bug#22081).
2006-11-16 14:01:31 +01:00
joerg@trift2.
844d5161fc
Merge trift2.:/MySQL/M41/spec-mtr-4.1
...
into trift2.:/MySQL/M50/spec-mtr-5.0
2006-11-15 20:34:44 +01:00
joerg@trift2.
65d6b24ed9
support-files/mysql.spec.sh : Use "report features" in the first test run.
2006-11-15 20:27:02 +01:00
joerg@trift2.
5057fa01f4
support-files/mysql.spec.sh : Make the server report its features in the first test run.
2006-11-13 12:10:12 +01:00
joerg@trift2.
ccadac3267
Build the generic RPMs including the "partition" feature. bug#23949
2006-11-13 11:10:27 +01:00
kent@mysql.com/c-544072d5.010-2112-6f72651.cust.bredbandsbolaget.se
87a9d23487
mysql.spec.sh:
...
Aligned test flags to TAR builds
2006-10-18 12:35:45 +02:00
kent@mysql.com/c-584072d5.010-2112-6f72651.cust.bredbandsbolaget.se
712c4cdbe3
mysql.spec.sh:
...
Corrected path to mysql-test directory
Removed man1/mysql_explain_log.1
2006-10-12 18:26:17 +02:00
cmiller@zippy.cornsilk.net
e72bc63906
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
...
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
2006-09-28 10:15:32 -04:00
kent@mysql.com/c-644072d5.010-2112-6f72651.cust.bredbandsbolaget.se
e826f7490e
mysql.spec.sh:
...
Added "test" RPM package
Install all binaries "make install" would
make_binary_distribution.sh:
Copy Cluster API headers into "/usr/include/mysql/storage/ndb/" (Bug#21955)
2006-09-24 00:41:20 +02:00
msvensson@shellback.(none)
91844fb81f
Bug#19738 "make install" tries to build files that "make" should already have built
...
- Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up.
2006-09-20 09:28:12 +02:00
tnurnberg@salvation.intern.azundris.com
030cbd2f73
Merge salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1
...
into salvation.intern.azundris.com:/home/tnurnberg/mysql-5.1-maint
2006-08-24 19:11:51 +02:00
kent@c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
386743c783
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-maint
2006-08-24 15:12:08 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
68e1e60f27
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-maint
2006-08-24 14:51:54 +02:00
kent@mysql.com/c-7b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
13e0fa2ccf
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-maint
2006-08-24 14:48:22 +02:00
kent@g4-2.local
510240fb56
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
...
into mysql.com:/Users/kent/mysql/bk/bug17194/my51-bug17194
2006-08-22 11:57:37 +02:00
kent@mysql.com/g4-2.local
c8b6563dfc
mysql.spec.sh:
...
Added ndb_error_reporter to the RPM install (bug#20426)
2006-08-22 11:55:08 +02:00
kent@mysql.com/g4-2.local
d210c8cfc3
Merge mysql.com:/Users/kent/mysql/bk/bug17194/my41-bug17194
...
into mysql.com:/Users/kent/mysql/bk/bug17194/my50-bug17194
2006-08-22 11:52:26 +02:00
kent@mysql.com/g4-2.local
442c111b72
mysql.spec.sh:
...
Added ndb_size.{pl,tmpl} to the RPM install (bug#20426)
2006-08-22 11:48:58 +02:00
kent@mysql.com/g4-2.local
b329f2c3ef
Many files:
...
Deleted config/ac-macros/ha_berkeley.m4
Removed more referenses to bdb
2006-08-21 15:34:29 +02:00
brian@zim.(none)
8d83366bac
Merge zim.(none):/home/brian/mysql/dep-5.1
...
into zim.(none):/home/brian/mysql/remove-bdb-5.1
2006-08-15 13:53:13 -07:00
joerg@trift2.
71be39fad6
Remove building, packing, and installing the "max" server from the RPM "spec" file.
2006-08-15 20:38:51 +02:00
brian@zim.(none)
af443c2dd8
Fixed warning message breakage.
...
Fixed install breakage (my own fault)
Edited exampled cnf to remove bdb references.
2006-08-13 22:28:41 -07:00
kroki/tomash@moonlight.intranet
5c272816ca
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.1-merge
2006-08-09 13:37:20 +04:00
patg@govinda.patg.net
8d1e5a5bb1
Merge govinda.patg.net:/home/patg/mysql-build/mysql-5.0-holyfoot
...
into govinda.patg.net:/home/patg/mysql-build/mysql-5.1-5.0-merge2
Push by holyfoot@production.mysql.com on Tue Jul 25 13:41:40 2006:
bk clone -l -r'holyfoot/hf@mysql.com/deer.(none)|ChangeSet|20060725085017|41021' mysql-5.0 tmp_merge
2006-08-08 09:01:32 -07:00
kroki/tomash@moonlight.intranet
5c90b6f810
Merge moonlight.intranet:/home/tomash/src/mysql_ab/tmp_merge
...
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-merge
2006-07-29 13:43:34 +04:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
01f5bc3a83
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2006-07-28 23:40:05 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
ef0c9d7588
mysql.spec.sh:
...
Man page for "mysqld" command move to section 8 (bug#21220)
2006-07-28 22:57:57 +02:00
joerg@trift2.
37408ed0f3
Merge trift2.:/M41/tmp_merge
...
into trift2.:/M50/merge-4.1-to-5.0
2006-07-24 15:47:57 +02:00
joerg@trift2.
5ac44f14cb
Merge trift2.:/M41/tmp_merge
...
into trift2.:/M50/merge-4.1-to-5.0
2006-07-24 14:06:17 +02:00
ingo/mydev@chilla.local
8bb8069653
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into chilla.local:/home/mydev/mysql-5.1-amerge
2006-07-24 10:05:17 +02:00
kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
2eacb14d2e
mysql.spec.sh:
...
Added new "mysql_explain_log" man page
Added missing install of "myisam_ftdump" man page
Added missing install of "mysqlman" man page
2006-07-19 02:46:48 +02:00
kent@mysql.com/g4-2.local
0f11ea9b0b
mysql.spec.sh:
...
Command "ndb_mgm" is an optional tool, and should only be in "ndb-tools" package (bug#21058)
2006-07-15 00:24:35 +02:00
kostja@bodhi.local
d7845b74db
Merge bodhi.local:/opt/local/work/tmp_merge
...
into bodhi.local:/opt/local/work/mysql-5.1-runtime-merge-5.0
2006-07-13 22:09:36 +04:00
joerg@trift2.
6ec62524b3
support-files/mysql.spec.sh : Fix a typing error.
2006-07-10 12:03:44 +02:00
joerg@mysql.com
dbc1ca22a0
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/bug20216-4.1
2006-07-05 10:42:49 +02:00
joerg@mysql.com
be5f48268c
When building RPMs, use the Perl script to run the tests, to automatically check SSL.
2006-07-04 12:30:08 +02:00
kent@mysql.com
593b359d92
mysql.spec.sh:
...
Disable old RPM strip
my_global.h:
Fixed wrong cast, which caused problems with gcc 4.0 and
floats in prepared statements (Bug #19694 )
mysqlmanager.vcproj:
Place output files in common release/debug directory
2006-06-30 02:49:28 +02:00
joerg@mysql.com
dcc67c0080
Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516).
2006-06-29 11:59:05 +02:00
evgen@moonbone.local
82369c4e65
Manual merge
2006-06-28 19:34:04 +04:00
joerg@mysql.com
0320bae069
Manual merge for bug#20216.
2006-06-27 20:32:08 +02:00
joerg@mysql.com
44653eed3b
Revert all previous attempts to call "mysql_upgrade" during RPM upgrade.
...
This finishes bug#18516, as far as "generic RPMs" are concerned.
2006-06-27 20:18:03 +02:00
joerg@mysql.com
3300c79b07
Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0
2006-06-27 20:04:44 +02:00
joerg@mysql.com
f789b87a1b
Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216),
...
manual merge from 4.0.
2006-06-27 18:36:41 +02:00
joerg@mysql.com
46ee3ac19d
Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).
2006-06-27 18:17:53 +02:00
evgen@moonbone.local
9a9224da68
Merge moonbone.local:/work/tmp_merge-4.1-opt-mysql
...
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
2006-06-23 14:53:41 +04:00
kent@mysql.com
ef2860e8ff
mysql.spec.sh:
...
Disable the simplistic auto dependency scan for test/bench (bug#20078)
2006-06-23 00:37:31 +02:00
joerg@mysql.com
7d83b7e48a
Improved fix for bug#18516 (also 19353):
...
1) Rename the old shell tool "mysql_upgrade", to avoid a name collision.
2) Improve the spec file, to explicitly use a temporary socket.
2006-06-22 14:28:05 +02:00
joerg@trift2.
5eea972046
Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1
2006-06-22 12:22:52 +02:00
joerg@mysql.com
27df8b07b7
Fix for bug#18516 (also #19353 , reported for 5.1):
...
In addition to include "mysql_upgrade" in a RPM, it should also be called
when the RPM is upgraded.
2006-06-20 22:40:46 +02:00
kent@mysql.com
34d82f0bc6
make_win_src_distribution.sh:
...
Removed reference to missing "tools" directory
mysql.spec.sh:
Changed flag --with-yassl => --with-ssl
Reverted accidental removal of the "make" call :-)
Configure --with-embedded-server
Corrected path to "libtool" command
Corrected path to "libmysqld.a"
Removed references to "safe_mysqld"
2006-06-20 12:24:12 +02:00
joerg@mysql.com
950b6c8dfa
Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1
2006-06-14 18:28:49 +02:00
joerg@mysql.com
1592670959
Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0
2006-06-14 18:25:09 +02:00
joerg@trift2.
075bb7faf2
Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1
2006-06-14 18:16:35 +02:00
joerg@mysql.com
6448fca67a
Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0
2006-06-14 18:13:36 +02:00
joerg@mysql.com
054cc44ede
support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#20118
2006-06-14 16:54:54 +02:00
brian@zim.(none)
ca63edc88b
Removing mysql_explain_log from 5.1
2006-05-23 17:26:56 -07:00
anozdrin@mysql.com
4a43bd1a3a
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/mnt/raid/MySQL/devel/5.1-rt-wl3158-merged
2006-05-22 14:22:58 +04:00
kent@mysql.com
49a8f9ee29
Merge
2006-05-21 10:38:59 +02:00
kent@mysql.com
0a778b4ce0
Merge
2006-05-21 00:47:08 +02:00
kent@mysql.com
2419732379
Merge
2006-05-20 23:36:17 +02:00
kent@mysql.com
e09910f91f
mysql.spec.sh:
...
Always compile position independent
2006-05-20 22:47:20 +02:00
anozdrin@mysql.com
c1113af15c
This is an implementation of two WL items:
...
- WL#3158: IM: Instance configuration extensions;
- WL#3159: IM: --bootstrap and --start-default-instance modes
The following new statements have been added:
- CREATE INSTANCE;
- DROP INSTANCE;
The behaviour of the following statements have been changed:
- SET;
- UNSET;
- FLUSH INSTANCES;
- SHOW INSTANCES;
- SHOW INSTANCE OPTIONS;
2006-05-18 18:57:50 +04:00
kent@mysql.com
d48e55eefd
Merge
2006-05-17 23:41:56 +02:00
kent@mysql.com
9fca0d766b
mysql.spec.sh:
...
Removed Berkeley DB
configure.in:
Adjusted Netware support
basic.t.c:
Change for Netware
Makefile.am:
Use thread safe libmysqlclient_r if it was built
valgrind.supp:
Hide report about strlen/_dl_init_paths
ha_tina.cc:
Temporarely disable CSV engine on Netware,
as the engine depends on mmap()
net_serv.cc:
Include <sys/select.h> for Netware
2006-05-16 22:47:22 +02:00
tomas@poseidon.ndb.mysql.com
b592d872ec
Merge jonas@perch:src/mysql-4.1
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2006-05-16 11:31:10 +02:00
tomas@poseidon.ndb.mysql.com
9e883ac3d7
Merge jonas@perch:src/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2006-05-16 11:05:50 +02:00
kent@mysql.com
a31d16abe8
Merge mysql.com:/data0/mysqldev/my/tmp_merge
...
into mysql.com:/data0/mysqldev/my/mysql-5.1-new
2006-05-16 01:59:09 +02:00
kent@mysql.com
9a93dce158
Merge
2006-05-10 22:15:08 +02:00
kent@mysql.com
237f4a37d8
mysql.spec.sh:
...
Compile in all character sets in Max (bug#14918)
2006-05-10 21:53:01 +02:00
jonas@perch.ndb.mysql.com
fddbcb2bf8
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-05-08 07:56:26 +02:00
jonas@perch.ndb.mysql.com
a5fc03387a
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
2006-05-08 07:48:08 +02:00
tomas@poseidon.ndb.mysql.com
f6ede396c0
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb
2006-05-04 21:55:12 +02:00
kent@mysql.com
b050f975c4
Merge
2006-05-02 02:45:04 +02:00
kent@mysql.com
e8fb05845b
Merge
2006-05-01 20:16:19 +02:00
kent@mysql.com
f45d6d3cc6
mysql.spec.sh:
...
Use "./libtool --mode=execute" to find real path to executables
2006-05-01 19:48:31 +02:00
jimw@mysql.com
f21c110d13
Merge mysql.com:/home/jimw/my/mysql-5.0-clean
...
into mysql.com:/home/jimw/my/mysql-5.1-clean
2006-04-30 13:27:38 -07:00
kent@mysql.com
b714a0cec4
mysql.spec.sh:
...
Backport of changes in 5.0 (bug#18294)
2006-04-29 01:28:04 +02:00
kent@mysql.com
50e8ba04cf
mysql.spec.sh:
...
Include and run mysql_upgrade if needed (bug#19353)
2006-04-28 17:03:11 +02:00
jonas@perch.ndb.mysql.com
ec6d198ea0
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
2006-04-26 16:57:43 +02:00
jonas@perch.ndb.mysql.com
59bced7f8a
Merge perch.ndb.mysql.com:/home/jonas/src/50-work
...
into perch.ndb.mysql.com:/home/jonas/src/51-work
2006-04-26 15:16:21 +02:00
jonas@perch.ndb.mysql.com
5d5a947f4c
Merge perch.ndb.mysql.com:/home/jonas/src/41-work
...
into perch.ndb.mysql.com:/home/jonas/src/50-work
2006-04-26 15:13:43 +02:00
jonas@perch.ndb.mysql.com
a8f407a7ef
Add ndb_config to rpm spec
2006-04-26 14:54:20 +02:00
jimw@mysql.com
b047dbbb1d
Remove ancient version of Debian packaging files.
2006-04-13 17:18:43 -07:00
jimw@mysql.com
4cfc378096
Clean up problem in mysql.spec caused by over-aggressive editor word-wrapping
2006-04-13 13:10:00 -07:00
jimw@mysql.com
55727ef6d0
Remove sql-bench from the server repository -- it is being maintained
...
in a distinct mysql-bench repository. Also add a new --benchdir option
to mysql-test-run.pl so the location of the mysql-bench repository can
be specified. The default location is adjacent to the source tree.
2006-04-13 10:34:46 -07:00
jimw@mysql.com
276109b155
Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,
...
and various stuff in Docs/. Also move the certificates used for testing
into mysql-test/std_data from the top-level SSL directory (now gone).
2006-04-11 18:54:24 -07:00
hartmut@mysql.com
4a4c459fa3
Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0
...
into mysql.com:/home/hartmut/projects/mysql/dev/5.1
2006-04-07 11:23:55 +02:00
igreenhoe@mysql.com
84bfed689d
Fix for Bug #16240
2006-04-06 10:13:46 -07:00
kent@mysql.com
b492d05ee9
Merge
2006-04-04 23:37:44 +02:00
kent@mysql.com
5e28df35af
Merge
2006-04-01 05:53:37 +02:00
kent@mysql.com
02c661dbcc
Makefile.am:
...
Let "make install" install mysql-test-run.pl
mysql.spec.sh:
Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662)
2006-04-01 05:44:10 +02:00
kent@mysql.com
b1dfda9b7f
mysql.spec.sh:
...
Changed product name from "Community Edition" to "Community Server", bug#17970
2006-03-07 18:53:26 +01:00
kent@mysql.com
16933400fc
mysql.spec.sh:
...
Enabled fast mutexes, now default is off
2006-03-06 14:57:41 +01:00
kent@mysql.com
ab77867efb
Merge
2006-03-06 13:50:52 +01:00
kent@mysql.com
2ffb679a27
mysql.spec.sh:
...
Use installed libz.a to avoid hard to solve static linking problems
2006-03-03 20:30:28 +01:00
kent@mysql.com
7ae10acbc4
mysql.spec.sh:
...
Don't create empty embedded RPM, bug#15769
2006-03-03 03:27:27 +01:00
bpontz@mysql.com
2e82e5aef8
Fix the changelog entry header, format was wrong
2006-02-21 15:39:43 -05:00
kent@mysql.com
281e0d0c6b
mysql.spec.sh:
...
Reintroduced a max build
Limited testing of 'debug' and 'max' servers
Berkeley DB only in 'max'
2006-02-20 03:10:08 +01:00
kent@mysql.com
088bc804aa
mysql.spec.sh:
...
Only install a subset of shared libraries created
2006-02-17 16:38:32 +01:00
joerg@mysql.com
868b1678e7
support-files/mysql.spec.sh : Use "-i" on "make test-force", add missing changelog notes.
2006-02-13 19:07:40 +01:00
joerg@mysql.com
47746b12c4
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/M50/rpmspec-5.0
2006-02-13 18:04:30 +01:00
kent@mysql.com
eb9683442d
Merge
2006-02-12 20:45:03 +01:00
joerg@mysql.com
49caf76e59
support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i test-force", changelog.
2006-02-10 18:07:14 +01:00
joerg@mysql.com
ceaf0017e3
support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for log file evaluation.
2006-02-10 17:40:04 +01:00
kent@mysql.com
9f86a9bdcc
Makefile.am:
...
Link with CLIENT_EXTRA_LDFLAGS, enable us to
pass on libtool flags '-full-static' and '-static'
using '--with-client-ldflags' to configure.
mysql.spec.sh:
Pass '-static' to libtool, link static with our
own libraries, dynamic with system libraries.
Link with the bundled zlib.
2006-02-09 03:11:45 +01:00
knielsen@mysql.com
920ac3a094
Modified RPM spec to match new 5.1 debug+max combined community packaging.
2006-02-08 11:42:17 +01:00
konstantin@mysql.com
9f0bb47f87
Merge mysql.com:/home/kostja/mysql/tmp_merge
...
into mysql.com:/home/kostja/mysql/mysql-5.1-merge
2006-02-02 23:27:06 +03:00
joerg@mysql.com
166c9f8405
Update the spec file for the shared compat RPM with version info.
2006-01-19 10:44:44 +01:00
kent@mysql.com
2205d1b8d5
mysql.spec.sh, make_binary_distribution.sh, Makefile.am, mysql.sln:
...
Added "client/mysqlslap"
mysqlslap.vcproj, mysqlslap.def:
new file
2005-12-19 01:12:11 +01:00
rparranovo@mysql.com
0a836ee845
Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.1-new
...
into mysql.com:/home/novo/MySQL/mysql-5.1
2005-12-15 00:40:07 -03:00
jani@a193-229-222-105.elisa-laajakaista.fi
2ed8d82c61
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-12-14 09:42:05 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
3069276592
Datadir variable should not be reset, if it was
...
set in this script.
2005-12-14 02:01:54 +02:00
aivanov@mysql.com
645805385d
Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92
...
into mysql.com:/home/alexi/innodb-ss/mysql-5.1-ss92
2005-12-13 23:56:22 +03:00
rparranovo@mysql.com
acc6609bfd
* made the following changes for the generic 5.1 RPM spec file
...
- Added zlib to the list of (static) libraries installed
- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
- Compile MySQL with bundled zlib
- Fixed %packager name to "MySQL Production Engineering Team"
2005-12-12 17:45:54 -03:00
rparranovo@mysql.com
ea54b05897
mysql.spec.sh:
...
* made the following changes for the generic 5.0 RPM spec file
- Added zlib to the list of (static) libraries installed
- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
- Compile MySQL with bundled zlib
- Fixed %packager name to "MySQL Production Engineering Team"
2005-12-12 17:29:02 -03:00
joerg@mysql.com
2eb0e9a43c
Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1
2005-12-05 19:00:00 +01:00
joerg@mysql.com
b9451ee51f
Merge from 4.1, partly manual.
2005-12-05 18:33:48 +01:00
joerg@mysql.com
7ce92291f0
Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
...
(Backport of an identical change from 5.0)
2005-12-05 17:53:42 +01:00
jani@a193-229-222-105.elisa-laajakaista.fi
5273071265
Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
...
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new
2005-11-23 14:57:00 +02:00
joerg@mysql.com
205c6fc1e9
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/M41/mysql-4.1
2005-11-23 09:38:12 +01:00
joerg@mysql.com
9b0bfb8858
Manual merge from 4.1 (bug#15145).
2005-11-22 20:30:45 +01:00
joerg@mysql.com
511fbac4df
Manual merge from 4.1, bug#15145.
2005-11-22 20:15:54 +01:00
joerg@mysql.com
c735d07dec
support-files/mysql.spec.sh
...
Fix a possible problem on RPM un-install. bug#15145
2005-11-22 19:58:58 +01:00
kent@mysql.com
bcdd552d6e
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck
2005-11-19 11:20:52 +01:00
guilhem@mysql.com
2f95fc2701
Merge mysql.com:/home/mysql_src/mysql-5.0
...
into mysql.com:/home/mysql_src/mysql-5.1-merge-of-5.0 (not all files are good,
I'll fix; I'll ask some devs to check their part)
2005-11-18 16:38:01 +01:00
joerg@mysql.com
9f065041fc
Not all RPM builds can use the bundled zlib, due to dependency and link conflicts. Solve this.
2005-11-11 22:18:41 +01:00
jimw@mysql.com
eeaecbc2bd
Sync suggestions for bdb_cache_size in my-medium.cnf and my-huge.cnf to
...
be the same as the suggested innodb_buffer_pool_size.
2005-11-11 11:41:23 -08:00
petr@mysql.com
0f373f9501
Merge mysql.com:/home/cps/mysql/trees/mysql-4.1
...
into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin
2005-11-08 01:27:15 +03:00
kent@mysql.com
58dd64612c
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-07 13:39:03 +01:00
kent@mysql.com
79aaf0754d
mysql.spec.sh:
...
Always use bundled zlib
2005-11-05 01:44:35 +01:00
monty@mysql.com
a6f5375cb0
Merge mysql.com:/home/my/mysql-5.0
...
into mysql.com:/home/my/mysql-5.1
2005-11-05 01:32:55 +02:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
kent@mysql.com
ee0b6db191
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
2005-11-04 01:15:35 +01:00
lenz@mysql.com
f2eeaca387
Merge bk-internal:/home/bk/mysql-4.1
...
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
2005-11-01 17:46:00 +01:00
lenz@mysql.com
72343cef75
Merge bk-internal:/home/bk/mysql-5.0
...
into mysql.com:/data0/mysqldev/lenz/mysql-5.0
2005-11-01 17:39:09 +01:00
jani@ua141d10.elisa.omakaista.fi
44aea416f9
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp
2005-10-31 11:54:36 +02:00
jimw@mysql.com
27685c0c47
Merge mysql.com:/home/jimw/my/mysql-4.1-13811
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-10-28 18:43:52 -07:00
lenz@mysql.com
7decf21c02
- after merge fix: removed pack_isam from the RPM spec file list again
2005-10-28 16:50:52 +02:00
lenz@mysql.com
303ba37044
- added man page for the mysqlmanager in the RPM spec file list
2005-10-28 13:31:19 +02:00
lenz@mysql.com
8303ca007a
- after merge fixes
2005-10-28 11:10:29 +02:00
lenz@mysql.com
0f3192323c
- fixed RPM spec file list after merge, removed dupes
2005-10-28 10:46:07 +02:00
lenz@mysql.com
92266c95de
Merge mysql.com:/data0/mysqldev/lenz/mysql-4.0
...
into mysql.com:/data0/mysqldev/lenz/mysql-4.1
2005-10-27 18:34:20 +02:00
mysqldev@mysql.com
b3263c032e
- cleanup: removed the empty NEW-RPMS directory and all references
...
- cleanup: removed obsolete support-files/MacOSX/make_mysql_pkg.pl
script (we now use Do-pkg for building OS X packages)
2005-10-27 18:32:14 +02:00
lenz@mysql.com
6b123044d0
- after merge fixes
2005-10-27 16:53:14 +02:00
lenz@mysql.com
f793d7b5bf
- Removed obsolete and outdated man page files from the man
...
directory - these files are now maintained in the mysqldoc
repository and included in the source distribution during the
release build. Updated the configure.in script and Makefiles to
create the man page file list at build time
- Updated the file list in the RPM spec file to include all currently
available man pages (this can not be done with wildcards, as
the man pages are spread across several subpackages. However, RPM
warns about unpackaged files, so newly added man pages can be
spotted)
2005-10-27 14:51:58 +02:00
kent@mysql.com
e3c4993bf3
mysql.spec.sh:
...
Made yaSSL support an option (off by default)
2005-10-19 22:00:12 +02:00
kent@mysql.com
8bccfab21f
mysql.spec.sh:
...
Enabled yaSSL
mysql-test-run.pl:
Increased test case timeout from 15 min
2005-10-19 02:53:03 +02:00
kent@mysql.com
dcd4b9923a
mysql.spec.sh:
...
Give mode arguments the same way in all places
Moved copy of mysqld.a to "standard" build, but
disabled it as we don't do embedded yet in 5.0
2005-10-15 01:40:28 +02:00
kent@mysql.com
4ea2aacb2a
mysql.spec.sh:
...
For 5.x, always compile with --with-big-tables
Copy the config.log file to location outside
the build tree
2005-10-14 22:49:53 +02:00
kent@mysql.com
5035abf052
mysql.spec.sh:
...
Removed unneeded/obsolte configure options
Added archive engine to standard server
Removed the embedded server from experimental server
Changed suffix "-Max" => "-max"
Changed comment string "Max" => "Experimental"
2005-10-14 22:11:52 +02:00
lenz@mysql.com
89e10f34c3
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
2005-10-13 22:16:24 +02:00
lenz@mysql.com
c93927eef0
- added a usermod call in the postinstall section of the RPM spec file
...
to assign a potential existing mysql user to the correct user group (BUG#12823)
2005-10-13 22:10:54 +02:00
lenz@mysql.com
a315d1be76
RPM spec file fixes:
...
- added a usermod call to assign a potential existing mysql user to the
correct user group (BUG#12823)
- Save the perror binary built during Max build so it supports the NDB
error codes (BUG#13740)
- added a separate macro "mysqld_group" to be able to define the
user group of the mysql user seperately, if desired.
2005-10-13 22:01:02 +02:00
jimw@mysql.com
8f659d05a2
Fix typo (thread_cache should be thread_cache_size) in example
...
configuration files. (Bug #13811 )
2005-10-13 11:05:59 -07:00
ndbdev@dl145b.mysql.com
147e22650e
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-10-10 17:15:25 +02:00
lenz@mysql.com
0b80982497
- typo fix: rott->root in the file attributes for mysql_client_test of the RPM spec file
2005-10-10 13:00:41 +02:00
tomas@poseidon.ndb.mysql.com
620b7bafb0
Merge
2005-10-06 10:54:07 +02:00
lenz@mysql.com
54d60d7fa7
Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
2005-09-29 14:35:07 +02:00
lenz@mysql.com
68e6b0e21d
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
2005-09-29 13:57:41 +02:00
lenz@mysql.com
443048f61c
- fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPM
...
spec file (the $RBR variable did not get expanded, thus leaving old build
roots behind)
2005-09-29 13:55:54 +02:00
kent@mysql.com
095efe48a5
Makefile.am, configure.in:
...
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
ndbdev@dl145b.mysql.com
46cc62e216
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-09-09 15:26:47 +02:00
jimw@mysql.com
e2643c2942
Fix handling of libexecdir and sbindir in mysql.server, and note that
...
basedir and datadir settings in script may be overwritten by settings
in configuration files. (Bug #12550 )
2005-08-26 12:02:06 -07:00
pappa@c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se
02056f8e3a
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-25 13:11:38 -04:00
monty@mishka.local
f384e08277
Merge mishka.local:/home/my/mysql-4.1
...
into mishka.local:/home/my/mysql-5.0
2005-08-25 06:55:48 +03:00
joerg@mysql.com
ddcbf609c4
Ensure that a failing test does not stop testing or the whole RPM build process.
2005-08-22 12:48:01 +02:00
lenz@mysql.com
4880d22b79
- Removed a non-fatal error when running the Mac OS X 10.4 PackageMaker:
...
CFBundleShortVersionString in Info.plist may not include a version
suffix like "-beta" (BUG#12584)
- Minor cleanup: removed two unused keys from Info.plist: IFMajorVersion
and IFMinorVersion
2005-08-15 15:44:56 +02:00
lenz@mysql.com
acaad2c70b
Merge mysql.com:/space/my/mysql-4.0
...
into mysql.com:/space/my/mysql-4.0-merge
2005-08-12 14:44:16 +02:00
lenz@mysql.com
61a9bace12
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 14:44:03 +02:00
lenz@mysql.com
77bb2add1b
Merge mysql.com:/space/my/mysql-4.1-merge
...
into mysql.com:/space/my/mysql-5.0-build
2005-08-12 11:49:42 +02:00
lenz@mysql.com
8a72ee556d
Merge mysql.com:/space/my/mysql-4.0-merge
...
into mysql.com:/space/my/mysql-4.1-merge
2005-08-12 08:13:02 +02:00
lenz@mysql.com
16b696a60e
- another comment typo fixed
2005-08-11 21:18:45 +02:00
lenz@mysql.com
c1c336f84b
- Fix for BUG#11380 (as recommened by JimW): renamed the preinstall/postinstall scripts to
...
preflight/postflight instead, so they are run every time a PKG is installed, not only for
a fresh installation
2005-08-11 20:23:12 +02:00
lenz@mysql.com
776bf91371
- Make sure the Mac OS X support files are built, but not installed by "make install" (the previous
...
change was too drastic) (BUG#12506)
2005-08-11 20:13:12 +02:00
pappa@c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se
69acde961f
Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into c-8b0ae253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.1
2005-08-05 18:01:34 -04:00
lenz@mysql.com
aff1328ada
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-08-04 12:48:28 +02:00
lenz@mysql.com
eb19f12fbf
- manual merge from 4.0 into 4.1: used the local version of ha_innodb.cc, merged
...
the rpm spec file changelog
2005-08-04 12:35:13 +02:00
lenz@mysql.com
307c920354
- Fixed the creation of the mysql user group account in the postinstall section of
...
the MySQL-server RPM spec file (BUG#12348)
2005-08-04 12:22:51 +02:00
lenz@mysql.com
08694dc2ac
- fixed enabling the Archive storage engine for the mysqld-max RPM binary
2005-08-04 11:57:30 +02:00
lenz@mysql.com
2889025acc
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-08-02 14:04:21 +02:00
lenz@mysql.com
9217c90a77
- Fixed the Requires: tag for the server RPM (BUG#12233), make sure to list all
...
required commands/packages so the installation succeeds. Removed the superflouus
Requires field from the source RPM.
2005-08-02 13:59:02 +02:00
monty@mysql.com
15d48525af
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-07-28 17:09:54 +03:00
lenz@mysql.com
a5b6057db5
- build the RPM binaries against the bundled zlib, when static linking is requested
2005-07-27 16:42:13 +02:00
ndbdev@dl145b.mysql.com
f5f56e4995
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-07-21 16:49:03 +02:00
lenz@mysql.com
e259d9e96b
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-07-20 22:41:53 +02:00
lenz@mysql.com
64e4c5ff98
- Manually merged fixes for BUG#12057 (*.plist (Mac OS X) files are installed on Linux)
2005-07-20 21:47:10 +02:00
lenz@mysql.com
ca9087a82c
- don't install the Mac OS X support files when running "make install" -
...
they're not needed outside of the source tree (BUG#12057)
- Removed some more unneeded files from "make install" along the way
2005-07-20 19:15:48 +02:00
tomas@poseidon.ndb.mysql.com
911d878ca9
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
...
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1
2005-07-15 15:08:38 +02:00
tomas@poseidon.ndb.mysql.com
f54afc792f
Merge
2005-07-15 14:13:23 +02:00
lenz@mysql.com
d9de51cf23
Merge mysql.com:/space/my/mysql-4.1.13-clone
...
into mysql.com:/space/my/mysql-5.0-build
2005-07-15 09:23:36 +02:00
lenz@mysql.com
0487cb938e
- manual merge of the fix for BUG#10984: create a "mysql" user group and assign the
...
mysql user account to that group in the server postinstall section of the RPM spec
file
2005-07-15 09:07:33 +02:00
lenz@mysql.com
0d7a2641b5
RPM spec file improvements:
...
- create a "mysql" user group and assign the mysql user account to that group
in the server postinstall section. (BUG 10984)
- backported some changes from the 4.1 RPM spec file (cleanups: removed the incomplete
Brazilian translations, more consequent use of macros)
2005-07-15 08:54:11 +02:00
tomas@poseidon.ndb.mysql.com
674b6bb151
Merge
2005-07-12 20:01:22 +02:00
lenz@mysql.com
1e399654b4
Merge mysql.com:/space/my/mysql-4.1-build
...
into mysql.com:/space/my/mysql-5.0-build
2005-07-04 22:14:14 +02:00
lenz@mysql.com
a300489d0c
- The Max package should Require a matching MySQL-server package. Automatically replace
...
the version string with the base version of the current build
2005-07-04 22:11:38 +02:00
lenz@mysql.com
329140329c
Merge mysql.com:/space/my/mysql-5.0 into mysql.com:/space/my/mysql-5.1
2005-06-15 12:48:08 +02:00
lenz@mysql.com
e218dffe1b
Merge mysql.com:/space/my/mysql-4.1
...
into mysql.com:/space/my/mysql-5.0-build
2005-06-15 00:57:23 +02:00
lenz@mysql.com
90479d9ece
- Do not build the RPMs statically on i386 by default, only when adding either
...
"--with static" or "--define '_with_static 1'" to the RPM build options.
Static linking really only makes sense when linking against the specially patched
glibc 2.2.5.
2005-06-14 21:39:08 +02:00
tulin@dl145b.mysql.com
b1a3d74f20
merge
2005-06-07 19:38:28 +02:00
lenz@mysql.com
d30f69ab0a
- added the libndbclient static and shared libraries to the RPM (BUG 10676)
2005-06-07 14:39:00 +02:00
ndbdev@dl145b.mysql.com
723173c0f3
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
2005-06-07 12:50:45 +02:00
lenz@mysql.com
6e5818e977
- manual merge of mysql.spec.sh
2005-06-07 11:40:56 +02:00
lenz@mysql.com
1c21f84afb
- BUG#10676: don't install "make_win_src_distribution" and "make_win_binary_distribution"
...
when doing "make install" (they are not needed/useful) outside the build tree. Added
"mysql_client_test" to the "MySQL-bench" RPM.
- some small RPM spec file improvements (more variables than hard-coded values, cleanups)
2005-06-07 10:25:51 +02:00
tomas@poseidon.ndb.mysql.com
925548d349
Merge
2005-06-02 00:51:30 +02:00
lenz@mysql.com
9afd2563e9
Merge of 4.1 -> 5.0
2005-06-01 15:11:14 +02:00
lenz@mysql.com
e877e71b17
Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
2005-06-01 13:06:15 +02:00
lenz@mysql.com
7bd3dd7cb3
- removed references to some obsolete files (BUG#10824)
...
- removed obsolete mysql-max.spec.sc RPM spec file (Max is built out of the standard
spec file)
2005-06-01 12:59:10 +02:00
tomas@poseidon.ndb.mysql.com
5088b28d09
Merge
2005-05-31 14:37:47 +02:00
joerg@mysql.com
9504bd0ddd
Manual merge.
2005-05-26 12:51:44 +02:00
joerg@mysql.com
830d25d985
Manual merge.
2005-05-25 18:11:03 +02:00
joerg@mysql.com
0d121fe01a
Added a missing "make clean" to the RPM "spec" file which had caused the original 4.1.12 RPMs to be broken.
...
(bug#10674, bug#10681)
2005-05-25 16:24:07 +02:00