summaryrefslogtreecommitdiff
path: root/support-files/mysql.spec.sh
Commit message (Collapse)AuthorAgeFilesLines
* Mergeunknown2006-05-211-0/+5
|\
| * Mergeunknown2006-05-201-0/+5
| |\ | | | | | | | | | | | | support-files/mysql.spec.sh: SCCS merged
| | * mysql.spec.sh:unknown2006-05-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Always compile position independent support-files/mysql.spec.sh: Always compile position independent
| * | Merge jonas@perch:src/mysql-4.1unknown2006-05-161-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 support-files/mysql.spec.sh: Auto merged
| | * \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-05-081-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1 support-files/mysql.spec.sh: Auto merged
* | | \ \ Merge jonas@perch:src/mysql-5.0unknown2006-05-161-1/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 support-files/mysql.spec.sh: Auto merged
| * \ \ \ \ Mergeunknown2006-05-101-1/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | mysql.spec.sh:unknown2006-05-101-1/+8
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compile in all character sets in Max (bug#14918) support-files/mysql.spec.sh: Compile in all character sets in Max (bug#14918)
* | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-05-081-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 support-files/mysql.spec.sh: Auto merged ndb/src/mgmsrv/Services.cpp: merge
| * | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-04-261-0/+1
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/include/util/SocketServer.hpp: Auto merged ndb/src/common/transporter/Transporter.cpp: Auto merged ndb/src/common/util/SocketServer.cpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged support-files/mysql.spec.sh: Auto merged
| | * | | Add ndb_config to rpm specunknown2006-04-261-0/+1
| | | | |
* | | | | Mergeunknown2006-05-011-24/+20
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | include/config-win.h: Auto merged
| * | | | mysql.spec.sh:unknown2006-05-011-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "./libtool --mode=execute" to find real path to executables support-files/mysql.spec.sh: Use "./libtool --mode=execute" to find real path to executables
| * | | | mysql.spec.sh:unknown2006-04-291-15/+57
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Backport of changes in 5.0 (bug#18294) support-files/mysql.spec.sh: Backport of changes in 5.0 (bug#18294)
* | | | mysql.spec.sh:unknown2006-04-281-1/+10
| |/ / |/| | | | | | | | | | | | | | | | | | | | Include and run mysql_upgrade if needed (bug#19353) support-files/mysql.spec.sh: Include and run mysql_upgrade if needed (bug#19353)
* | | Mergeunknown2006-04-011-0/+5
|\ \ \ | |/ /
| * | Makefile.am:unknown2006-04-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let "make install" install mysql-test-run.pl mysql.spec.sh: Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662) support-files/mysql.spec.sh: Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS (bug#16662) mysql-test/Makefile.am: Let "make install" install mysql-test-run.pl
* | | mysql.spec.sh:unknown2006-03-031-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Use installed libz.a to avoid hard to solve static linking problems support-files/mysql.spec.sh: Use installed libz.a to avoid hard to solve static linking problems
* | | mysql.spec.sh:unknown2006-03-031-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | Don't create empty embedded RPM, bug#15769 support-files/mysql.spec.sh: Don't create empty embedded RPM, bug#15769
* | | support-files/mysql.spec.sh : Manual merge: new "-i" in "make -i ↵unknown2006-02-101-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | test-force", changelog. support-files/mysql.spec.sh: Manual merge: new "-i" in "make -i test-force", changelog.
| * | support-files/mysql.spec.sh : Use "-i" on "make test-force", essential for ↵unknown2006-02-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | log file evaluation. support-files/mysql.spec.sh: Use "-i" on "make test-force"; this will prevent "make" from writing "***" which in turn was treated as a _build_ error by the log evaluation tool, causing it not to list the failing tests.
* | | mysql.spec.sh:unknown2005-12-121-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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" support-files/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"
* | | Merge from 4.1, partly manual.unknown2005-12-051-0/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | scripts/make_binary_distribution.sh: Auto merged support-files/mysql.spec.sh: Manual merge.
| * | Not all RPM builds can use the bundled zlib, due to dependency and link ↵unknown2005-12-051-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts. Solve this. (Backport of an identical change from 5.0) support-files/mysql.spec.sh: We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary. The fully static RPM build on "build" also does not work with the bundled zlib. With this change, we use the bundled zlib for "standard" RPMs (unless fully static, "build") and the one already installed on the system for the "max" build which is also labeled "experimental". (Backport of an identical change from 5.0)
* | | Manual merge from 4.1, bug#15145.unknown2005-11-221-12/+17
|\ \ \ | |/ /
| * | support-files/mysql.spec.sh unknown2005-11-221-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a possible problem on RPM un-install. bug#15145 support-files/mysql.spec.sh: Extend the file existence check for "init.d/mysql" on un-install to also guard the call to "insserv"/"chkconfig". bug#15145, br#5369 / 5586, csc#7129
* | | Not all RPM builds can use the bundled zlib, due to dependency and link ↵unknown2005-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | conflicts. Solve this. support-files/mysql.spec.sh: We cannot always use the bundled zlib, as this conflicts with the "shared" build of the "max" binary. The fully static RPM build on "build" also does not work with the bundled zlib. With this change, we use the bundled zlib for "standard" RPMs (unless fully stytic, "build") and the one already installed onm the system for the "max" build which is also labeled "experimental".
* | | Merge mysql.com:/home/cps/mysql/trees/mysql-4.1unknown2005-11-081-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/cps/mysql/trees/mysql-5.0-virgin sql/examples/ha_tina.cc: Auto merged support-files/mysql.spec.sh: SCCS merged
| * | mysql.spec.sh:unknown2005-11-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Always use bundled zlib support-files/mysql.spec.sh: Always use bundled zlib
* | | - after merge fix: removed pack_isam from the RPM spec file list againunknown2005-10-281-2/+0
| | | | | | | | | | | | | | | support-files/mysql.spec.sh: - after merge fix: removed pack_isam from the file list again
* | | - added man page for the mysqlmanager in the RPM spec file listunknown2005-10-281-0/+1
| | | | | | | | | | | | | | | support-files/mysql.spec.sh: - added man page for mysqlmanager
* | | - after merge fixesunknown2005-10-281-10/+27
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962: Auto merged BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19: Auto merged configure.in: Auto merged netware/BUILD/compile-linux-tools: Auto merged netware/BUILD/compile-netware-END: Auto merged man/Makefile.am: - after merge fix support-files/mysql.spec.sh: - after merge fix
| * | - fixed RPM spec file list after merge, removed dupesunknown2005-10-281-7/+2
| | | | | | | | | | | | | | | support-files/mysql.spec.sh: - fixed file list after merge, removed dupes
| * | - after merge fixesunknown2005-10-271-4/+25
| |\ \ | | |/ | | | | | | | | | | | | | | | configure.in: Auto merged support-files/mysql.spec.sh: - after-merge fix
| | * - Removed obsolete and outdated man page files from the manunknown2005-10-271-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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) BitKeeper/deleted/.del-isamchk.1.in~9d44303f6d951962: Delete: man/isamchk.1.in BitKeeper/deleted/.del-isamlog.1.in~416d91adbf665b19: Delete: man/isamlog.1.in BitKeeper/deleted/.del-mysql.1.in~3f4dbf65d31fea3a: Delete: man/mysql.1.in BitKeeper/deleted/.del-mysqlaccess.1.in~2adf98feb44a0dbf: Delete: man/mysqlaccess.1.in BitKeeper/deleted/.del-mysqladmin.1.in~81703c6092a1f769: Delete: man/mysqladmin.1.in BitKeeper/deleted/.del-mysqld.1.in~42371a82eb27d87c: Delete: man/mysqld.1.in BitKeeper/deleted/.del-mysqld_multi.1.in~b3f1c5343b8481e6: Delete: man/mysqld_multi.1.in BitKeeper/deleted/.del-mysqld_safe.1.in~6f34e14acc0c5e0b: Delete: man/mysqld_safe.1.in BitKeeper/deleted/.del-mysqldump.1.in~9520980bfec710d5: Delete: man/mysqldump.1.in BitKeeper/deleted/.del-mysql_fix_privilege_tables.1.in~7422405bb0e64325: Delete: man/mysql_fix_privilege_tables.1.in BitKeeper/deleted/.del-mysql_zap.1.in~df5cf8089b50c624: Delete: man/mysql_zap.1.in BitKeeper/deleted/.del-mysqlshow.1.in~81ce953dcc1a282f: Delete: man/mysqlshow.1.in BitKeeper/deleted/.del-perror.1.in~60d1efcbe71bdd9c: Delete: man/perror.1.in BitKeeper/deleted/.del-replace.1.in~e92dc1aea682608c: Delete: man/replace.1.in configure.in: - dynamically add man pages included in the man directory (the BK tree only contains one dummy file, the directory is populated by the Bootstrap script by copying current man pages from the documentation server) man/Makefile.am: - removed hard-coded list of man pages, the list is populated during the configure stage. When building from BK, only one placeholder file exists. For the release builds, this directory is populated by the Bootstrap script, which takes man page files from the documentation server. man/mysqlman.1: - removed version number support-files/mysql.spec.sh: - adjusted file list: added man pages that are now part of the official source distribution (taken from the documentation server)
| | * - added a usermod call in the postinstall section of the RPM spec file unknown2005-10-131-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | to assign a potential existing mysql user to the correct user group (BUG#12823) support-files/mysql.spec.sh: - added a usermod call to assign a potential existing mysql user to the correct user group (BUG#12823)
* | | mysql.spec.sh:unknown2005-10-191-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | Made yaSSL support an option (off by default) support-files/mysql.spec.sh: Made yaSSL support an option (off by default)
* | | mysql.spec.sh:unknown2005-10-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled yaSSL mysql-test-run.pl: Increased test case timeout from 15 min mysql-test/mysql-test-run.pl: Increased test case timeout from 15 min support-files/mysql.spec.sh: Enabled yaSSL
* | | mysql.spec.sh:unknown2005-10-151-12/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 support-files/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
* | | mysql.spec.sh:unknown2005-10-141-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For 5.x, always compile with --with-big-tables Copy the config.log file to location outside the build tree support-files/mysql.spec.sh: For 5.x, always compile with --with-big-tables Copy the config.log file to location outside the build tree
* | | mysql.spec.sh:unknown2005-10-141-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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" support-files/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"
* | | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-10-131-5/+22
|\ \ \ | |/ / | | | | | | | | | support-files/mysql.spec.sh: Auto merged
| * | RPM spec file fixes:unknown2005-10-131-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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. support-files/mysql.spec.sh: - 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.
* | | - typo fix: rott->root in the file attributes for mysql_client_test of the ↵unknown2005-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | | RPM spec file support-files/mysql.spec.sh: - typo fix: rott->root in the file attributes for mysql_client_test
* | | Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0unknown2005-09-291-1/+6
|\ \ \ | |/ / | | | | | | | | | support-files/mysql.spec.sh: Auto merged
| * | Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1unknown2005-09-291-1/+6
| |\ \ | | |/ | | | | | | | | | support-files/mysql.spec.sh: Auto merged
| | * - fixed the removing of the RPM_BUILD_ROOT in the %clean section of the RPMunknown2005-09-291-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | spec file (the $RBR variable did not get expanded, thus leaving old build roots behind) support-files/mysql.spec.sh: - fixed the removing of the RPM_BUILD_ROOT in the %clean section (the $RBR variable did not get expanded, thus leaving old build roots behind)
* | | Merge mishka.local:/home/my/mysql-4.1unknown2005-08-251-2/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-5.0 BitKeeper/etc/ignore: auto-union BitKeeper/deleted/.del-Grep.cpp~ad798e9ae519d667: Auto merged BitKeeper/deleted/.del-Grep.hpp~b05e3af6cfabe387: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged BitKeeper/deleted/.del-have_lowercase0.inc: Delete: mysql-test/include/have_lowercase0.inc VC++Files/mysql-test/mysql_test_run_new.dsp: Auto merged configure.in: Auto merged mysql-test/include/ps_conv.inc: Auto merged mysql-test/mysql-test-run.pl: Auto merged sql/ha_innodb.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_example.cc: Auto merged sql/sql_table.cc: Auto merged support-files/mysql.spec.sh: Auto merged VC++Files/client/mysqltest.dsp: manual merge VC++Files/sql/mysqld.dsp: manual merge mysql-test/r/grant2.result: patch merge mysql-test/r/subselect2.result: manual merge mysql-test/t/grant2.test: patch merge mysys/charset.c: Remove already deleted function sql/examples/ha_archive.h: Manual merge sql/sql_acl.cc: manual merge sql/sql_db.cc: merge (no differences) sql/sql_select.cc: manual merge sql/table.h: merge (no differences) tests/mysql_client_test.c: patch merge
| * | Ensure that a failing test does not stop testing or the whole RPM build process.unknown2005-08-221-2/+2
| | |
* | | Merge mysql.com:/space/my/mysql-4.1-buildunknown2005-08-041-2/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-5.0-build sql/ha_innodb.cc: Auto merged support-files/mysql.spec.sh: Auto merged
View Lorry Controller Status