Commit graph

171 commits

Author SHA1 Message Date
unknown
2df0588981 mysql-copyright:
Small fixes to handle packaging of windows src (commercial) file


Build-tools/mysql-copyright:
  Small fixes to handle packaging of windows src (commercial) file
2004-06-11 00:40:56 -07:00
unknown
7d3d862f56 see notes for mysql-copyright scripts
Build-tools/mysql-copyright-2:
  small fix
Build-tools/mysql-copyright:
  deals with windows src file now
2004-06-08 13:36:32 -07:00
unknown
ca96a3b410 Merge pgalbraith@bk-internal.mysql.com:/home/bk/mysql-4.0
into krsna.patg.net:/home/patg/mysql-4.0


Build-tools/Do-compile:
  Auto merged
2004-06-08 13:22:31 -07:00
unknown
606cb09d86 Added option --config-extra-env to Do-compile
Build-tools/Do-compile:
  Added option --config-extra-env
include/my_global.h:
  Cleaned up comment to follow same indentation style as the rest of the code
2004-05-28 11:02:34 +03:00
unknown
b3851363ba Added patches from Novell
Build-tools/Do-compile:
  Fixed indentation
configure.in:
  Added patches from Novell
  Added C_EXTRA_FLAGS as an easy way to pass flags to both CFLAGS and CXXFLAGS
extra/perror.c:
  Fixed error number reporting to not report 'Unknown error'
include/my_global.h:
  Defines to make NETWARE patches cleaner
include/thr_alarm.h:
  Fixed wrong macro
netware/mysql_install_db.c:
  Indentation fix
2004-05-25 22:00:14 +03:00
unknown
a3d48fc6db see notes for Do-compile
Build-tools/Do-compile:
  Added two options that:
  1. Clear logs on each host prior to build
  2. Turn off ndbcluster
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2004-05-24 12:48:18 -07:00
unknown
84418a9edc - Do-pkg: PGK and DMG names now include the full arch name (e.g.
"-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
   Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
   how we name all other packages)


Build-tools/Do-pkg:
   - PGK and DMG names now include the full arch name (e.g. 
     "-apple-darwin7.3.0-powerpc") - this is needed as we now will provide
     Mac OS X 10.2.x and Mac OS X 10.3.x PGKs (and it's more in line of
     how we name all other packages)
2004-03-19 18:49:14 +01:00
unknown
ea9aa4d352 Major work on Windows build automation-- add binary packaging, suffixes
Build-tools/Do-win-build:
  Add suffix option, classic build, binary packaging
VC++Files/comp_err/comp_err.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/my_print_defaults/my_print_defaults.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisam_ftdump/myisam_ftdump.dsp:
  Update project file -- binary goes to ../client_release now
VC++Files/myisampack/myisampack.dsp:
  Update project file -- binary goes to ../client_release now
scripts/Makefile.am:
  Add make_win_binary_distribution to Makefile (for @VERSION@)
2004-02-19 19:04:47 -01:00
unknown
945c2c1cb4 Merge 2004-02-09 12:16:33 -01:00
unknown
68d61d5b8f - don't add merge ChangeSets to the Changelog in Bootstrap
(reduce the noise)


Build-tools/Bootstrap:
   - don't add merge ChangeSets to the Changelog (reduce the noise)
2004-02-04 21:26:52 +01:00
unknown
46f156696f Some small enhancements for Do-compile:
- more flexible removal of old cruft before creating the new binary
   distribution
 - more flexible globbing for the binary tarball (required for QNX, where
   the file name ends on *.tgz instead of .tar.gz due to file name lenght
   restrictions


Build-tools/Do-compile:
  Some small enhancements:
  
   - more flexible removal of old cruft before creating the new binary
     distribution
   - more flexible globbing for the binary tarball (required for QNX, where
     the file name ends on *.tgz instead of .tar.gz due to file name lenght
     restrictions
2004-02-04 14:16:36 +01:00
unknown
a5b9966c0d Revise Windows build script, correct comment re NetWare in libmysql.c
Build-tools/Do-win-build:
  Copy logfile for pickup by Do-compile-win
libmysql/libmysql.c:
  Comment was previously inaccurate
2004-01-21 16:06:26 -01:00
unknown
17fdccce28 - remove unnecessary code from Do-rpm to delete the source tarball and
spec file after the build as RPM has its own option for this


Build-tools/Do-rpm:
   - remove unnecessary code to delete the source tarball and spec file
     after the build as RPM has its own option for this
2004-01-21 17:42:41 +01:00
unknown
f6940525aa Wrote small Windows build automation script in preparation
for re-working project files and enabling remote builds.
2004-01-15 16:08:32 -01:00
unknown
8e139ddc33 - Fixed another missing space 2003-12-23 16:51:14 +01:00
unknown
2d8e40ef8e - Bugfix for Do-rpm (moving of the resulting packages did not work due to
a missing space)
 - Define the subject of the failure mail reports within the calling script
   instead of logger.pm


Build-tools/Bootstrap:
   - Define the subject for the failure mail within the Build script
Build-tools/Do-rpm:
   - Define the subject of the failure email within the build script
   - Added missing space to make moving of the resulting packages working
Build-tools/logger.pm:
   - Define the subject for the failure mail within the calling script instead
     of here
2003-12-16 14:43:34 +01:00
unknown
8ab3553bba - Output redirection does not work with run_command(), use system()
instead.
2003-12-13 04:33:36 +01:00
unknown
2aabd584e2 - added missing space for previous commit 2003-12-13 04:23:07 +01:00
unknown
f246ca803d - Some small Perl enhancements for Do-compile: use more Perl builtins.
Build-tools/Do-compile:
   - use more Perl builtins (e.g. hostname(), basename()) instead of forking
     subprocesses
2003-12-13 03:49:50 +01:00
unknown
77ca2ff180 - Reworked the Do-rpm build script to be more flexible
- Reworked testing for gcc3 in the RPM spec file a bit


Build-tools/Do-rpm:
  Big overhaul:
  
   - Give the spec file name as the option, not the version number (required
     to be able to build commercial RPMs, too)
   - Some more logging and debugging, more documentation
support-files/mysql.spec.sh:
   - made testing for gcc3 a bit more robust and not to stomp on user
     settings for CXX
2003-12-12 23:06:26 +01:00
unknown
7764d6e528 - Rather "bk cat" the files from the mysqldoc BK tree during Bootstrap
than trying to copy them (they might have been "bk clean"ed and thus
   not available for copying)
 - Brushed up the Bootstrap online help a bit


Build-tools/Bootstrap:
   - Rather "bk cat" the files from the mysqldoc BK tree than trying to
     copy them (they might have been "bk clean"ed and thus not available
     for copying)
   - Brushed up the online help a bit
2003-12-11 10:53:28 +01:00
unknown
77a688766f - added missing option "--without-embedded" to be able to compile without
the embedded server (it was missing in the previous push)
2003-08-21 12:15:22 +02:00
unknown
be9744817c - Added a missing directory variable definition to the Bootstrap script.
Build-tools/Bootstrap:
   - defined $opt_directory to be the present working directory. No clue how
     this worked before...
2003-08-19 18:34:44 +02:00
unknown
a8aaa3ef46 - Do-pkg can now create a separate package including a MySQL Startup Item
for Mac OS X and add it to the installation Disk Image.


Build-tools/Do-pkg:
   - added code to build the StartupItem PKG along with the MySQL PKG and
     add it to the resulting Disk Image (can be skipped with --skip-si)
   - lots of cleanups (use more builtin Perl functions instead of 
     subprocesses, enable a full dry run without errors)
support-files/MacOSX/StartupItem.Info.plist:
   - removed IFPkgFlagOverwritePermissions and IFPkgFlagUseUserMask
2003-08-19 13:57:58 +02:00
unknown
9194f5ef33 - Optimized and cleaned up the Do-rpm and Bootstrap Perl scripts
- Enhanced Do-rpm to support building RPMs with different compilers
   and options


Build-tools/Bootstrap:
   - small optimization (use builtin Perl cwd() function instead of running
     "pwd" twice)
Build-tools/Do-rpm:
   - added options to handle different compilers and compile flags (e.g. when
     compiling on IA64 using the Intel ecc compiler)
   - code cleanups (use more builtin Perl functions instead of forking
     subrocesses)
   - don't try to probe various distribution-specific RPM options - query rpm
     directly instead
   - Pass the MySQL version as an argument, not an option (as it's not
     optional anyway)
2003-08-19 13:49:53 +02:00
unknown
9ac61d15fa make_win_src_distribution.sh:
Add --zip option for finer grain control over what package formats are created
Bootstrap:
  Create both Windows source packages


Build-tools/Bootstrap:
  Create both Windows source packages
scripts/make_win_src_distribution.sh:
  Add --zip option for finer grain control over what package formats are created
2003-08-13 19:32:34 +02:00
unknown
c32ebf3a86 Fixed typo in the Boostrap strip
Build-tools/Bootstrap:
   - fixed typo
2003-08-13 07:12:08 +02:00
unknown
965050afc9 - enabled embedded server in the binary distributions by default
(Do-compile)
 - added mysql.info to the binary distribution files (BUG#1019)
 - heavily reworked the Do-rpm script to be more in line with Do-pkg
 - create a "docs" subdirectory in the binary distribution and moved the
   manual, ChangeLog and mysql.info file into it to unclutter the top
   directory


Build-tools/Do-compile:
   - enable compiling with the embedded server by default (as requested by
     BrianA) - disable it with the "--disable-embedded" compile option.
Build-tools/Do-rpm:
   - replaced the original Shell script with a Perl script, similar to Do-pkg.
     Some more work remains to be done (copying the resulting packages,
     enable using different compile flags and compilers).
scripts/make_binary_distribution.sh:
   - move some docs into a subdirectory "docs" to not clutter the top 
     directory with too many files.
   - added mysql.info info file to the docs dir (BUG#1019)
2003-08-12 23:21:21 +02:00
unknown
b0700aff80 - added option "--pull" to be able to update the BK repositories before
starting the bootstrap
2003-08-12 13:49:11 +02:00
unknown
46f5c97d31 - some fixed for make_win_src_distribution to work properly
Build-tools/Bootstrap:
   - no need to create the make_win_src_distribution script in here - do
     it in the Makefile instead.
scripts/Makefile.am:
   - added make_win_src_distribution to bin_SCRIPTS, so it's automatically
     built
scripts/make_win_src_distribution.sh:
   - merge fixes (looks like CRLF problems)
2003-08-07 18:54:59 +02:00
unknown
76dc0bb0f0 New option for Bootstrap: -w | --win-dist to create Windows source package
Build-tools/Bootstrap:
  Add --win-dist option to create Windows source package
scripts/Makefile.am:
  Add make_win_src_distribution to CLEANFILES
2003-08-07 01:14:45 -04:00
unknown
aa28da79c1 - fixed a typo in previous push
Build-tools/Bootstrap:
   - duh!
2003-07-11 19:32:29 +02:00
unknown
762b13468d - fixed a bug in Bootstrap script: simply searching for the last tagged
ChangeSet was not sufficient to get the full ChangeLog between two
   released versions (when using "--changelog=last") as merging between 
   trees also merges the BK tags. Now we explicitely search for the last
   tagged ChangeSet that matches our major+minor version number, which 
   should match the last ChangeSet used for the previous release.


Build-tools/Bootstrap:
   - fixed a bug: simply searching for the last tagged ChangeSet was not
     sufficient to get the full ChangeLog between two released versions
     (when using "--changelog=last") as merging between trees also merges
     the BK tags. Now we explicitely search for the last tagged ChangeSet
     that matches our major+minor version number, which should match the
     last ChangeSet used for the previous release.
2003-07-11 18:24:13 +02:00
unknown
4f14446753 - make sure to compile with the correct --localstatedir and --libexedir
paths for the binary distributions (this will hopefully resolve the
   "file /usr/local/mysql/libexec/mysqld doesn't exist" error that many
   people are facing)
2003-06-30 15:00:28 +02:00
unknown
909596e030 - don't add separate debug symbol file to the binary distribution,
if it's built with debugging enabled or not stripped (save disk
   space)
2003-04-07 19:05:00 +02:00
unknown
3d6dcd6567 - fixed typo (build_command -> build-command) 2003-03-25 22:38:12 +01:00
unknown
f3a5d5aa98 - added new option "--build-command" to be able to use different
commands for building the sources
 - removed duplicate option "--revision"
 - added help for new option and reformatted help text a bit
2003-03-25 22:20:07 +01:00
unknown
2b051ccb81 - added option "--skip-disk-image" and short form "-s" in addition to the
already existing "--skip-dmg" (per Monty request)
 - Fixed handling of license files
2003-03-13 18:16:47 +01:00
unknown
8c689249af - added option "--skip-dmg" to skip the building of the disk image after
packaging
 - enclosed some variables in quotes for safeguarding
 - add a license file (GPL or MySQLEULA) to the package so it will be
   displayed during installation (needs to be tested)
2003-03-03 16:01:05 +01:00
unknown
baa0238c94 - Heavily reworked the Do-pkg script to use functions from logger.pm
- moved helper functions from Bootstrap script to logger.pm 


Build-tools/Bootstrap:
   - renamed logfile -> LOGFILE
   - moved functions abort() and run_command() to logger.pm for better
     reusability
Build-tools/Do-pkg:
   - heavily reworked: now make use of the logger.pm helper functions
   - added new options: --dry-run, --log, --mail, --verbose
Build-tools/logger.pm:
   - added functions run_command() and abort() from Bootstrap script for
     better code reusability
support-files/MacOSX/postinstall.sh:
   - made script more robust
2003-02-25 15:20:07 +01:00
unknown
68ee31cf6c - added more files to support-files/MacOSX and added them to the
distribution
 - added Bootstrap, logger.pm and Do-pkg to Build-tools:
   Bootstrap is used to build the source distribution for the binary builds
   logger.pm includes some helper functions
   Do-pkg converts a binary distribution into a Mac OS X PKG (still needs
   some polishing)


support-files/MacOSX/Description.plist.sh:
   - Shortened IFPkgDescriptionDescription a bit
support-files/MacOSX/Makefile.am:
   - Added more files (StartupParameters.plist, postinstall, preinstall) to
     distribution
2003-02-19 21:02:05 +01:00
unknown
1846f7320a Merge sergbook.mysql.com:/usr/home/serg/Abk/mysql
into sergbook.mysql.com:/usr/home/serg/Abk/mysql-4.0


Build-tools/Do-compile:
  Auto merged
bdb/dist/configure.in:
  Auto merged
scripts/mysqlhotcopy.sh:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
2003-02-10 14:56:30 +01:00
unknown
98b953fddf Small enhancements for Do-compile:
- add version number to build log files (e.g. Logs/build-4.1-standard.log)
 - add host name and uname to Subject line of build failure mails
   (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")

 -> Please merge with all other trees!


Build-tools/Do-compile:
  Small enhancements:
   - add version number to build log files (e.g. Logs/build-4.1-standard.log)
   - add host name and uname to Subject line of build failure mails
     (e.g. "Subject: build(Linux): mysql-4.1-standard compilation failed")
2003-02-05 18:02:12 +01:00
unknown
787a2d4eda - merge relevant Do-compile changes from 4.0 tree
- use "gnutar" on Mac OS X to build the binary distribution


Build-tools/Do-compile:
   - merged relevevant changes from 4.0 (Options no-mysqltest, no-benchmark,
     log_timestamp function)
scripts/make_binary_distribution.sh:
   - make sure to use "gnutar" (on Mac OS X) to pack up the binary distribution
     (Mac OS X "tar" seems to be buggy - the resulting tarballs appear to be
     corrupted, e.g. when opening them with Midnight Commander. GNU tar seems
     to extract them correctly, though)
2003-01-23 20:07:19 +01:00
unknown
e2d2c25407 - removed a redundant "-u root" (it's included in $mysqladmin_args) 2003-01-23 19:54:20 +01:00
unknown
093735ad07 - removed duplicate code (merge error) 2003-01-22 12:13:51 +01:00
unknown
b3b66f6408 Portability fixes
Fixed test suite for HPUX 10.20 and MacOSX


Build-tools/Do-compile:
  Added timeout to mysqladmin shutdown commands
  Kill old running mysqld started by earlier runs
  Removed run time warning from LD_LIBRARY_PATH
client/mysqladmin.c:
  Return 1 if pid file isn't deleted on shutdown.
  Fix error message if pid file is not deleted
client/mysqltest.c:
  Always allow --debug flag
  (Makes it easier to run mysql-test-run)
mysql-test/mysql-test-run.sh:
  A lot of safety fixes. 
  This fixes some problems with test suite for HPUX 10.20 and MacOSX
sql-bench/bench-init.pl.sh:
  Allow tests to change time limit.
sql-bench/crash-me.sh:
  Indentation cleanups
  Added DROP for a created table
sql-bench/test-alter-table.sh:
  Added default time limit
  Changed test to be estimated to get down run time.
  Fixed that add_multi_col is detected
sql-bench/test-insert.sh:
  Comment cleanup
sql/mysql_priv.h:
  Removed not needed prototype.
sql/mysqld.cc:
  Removed DBUG warnings
  Removed default argument for clean_up() and made it static.
  More comments.
  Ignore SIGHUP during shutdown
sql/net_pkg.cc:
  More comments
sql/slave.cc:
  Added DBUG_PRINT messages
2003-01-07 16:53:10 +02:00
unknown
e3c7f4d85e A lot of portability fixes.
Added rename table for BDB. This fixes a bug in ALTER TABLE with BDB tables.


BUILD/SETUP.sh:
  Enabled uninitalized warnings for debug builds.
Build-tools/Do-compile:
  Added options --no-mysqltest and --no-benchmarks
  Log time before each stage
  Removed warnings on some OS (at least hpux11)
acinclude.m4:
  Fixed call to wrong function
configure.in:
  Don't use -O3 as compiler option with aCC
innobase/include/univ.i:
  Removed compiler warning (on Hpux11)
innobase/os/os0file.c:
  Removed compiler warning (on Hpux11)
innobase/trx/trx0sys.c:
  Removed compiler warning (on Hpux11)
innobase/trx/trx0trx.c:
  Removed compiler warning (on Hpux11)
innobase/ut/ut0ut.c:
  Removed compiler warning (with gcc)
myisam/mi_check.c:
  Added missing 'static'
myisam/mi_test1.c:
  Added missing 'static'
mysys/my_getopt.c:
  Added missing 'static'
sql/ha_berkeley.cc:
  Added rename table. This fixes a bug in ALTER TABLE with BDB tables.
  Fixed compilation problem on OSF1
sql/ha_berkeley.h:
  Added rename table. This fixes a bug in ALTER TABLE with BDB tables.
sql/mini_client.cc:
  Added reinterpret cast to avoid some warnings.
sql/sql_parse.cc:
  Added reinterpret cast to avoid some warnings.
  Removed usage of strnlen() as this gave portability problems.
sql/sql_union.cc:
  Added reinterpret cast to avoid some warnings.
sql/table.cc:
  Added reinterpret cast to avoid some warnings.
tools/mysqlmanager.c:
  Added missing 'static'
2003-01-05 20:18:49 +02:00
unknown
18ca5c4dbc merge with 3.23 to get bugfixes for <=> NULL and --bind-address
Build-tools/Do-compile:
  Auto merged
mysql-test/r/func_test.result:
  Auto merged
mysql-test/t/func_test.test:
  Auto merged
mysql-test/t/func_time.test:
  Auto merged
mysql-test/t/null_key.test:
  Auto merged
mysql-test/mysql-test-run.sh:
  Ignore changes from 3.23
mysql-test/r/func_time.result:
  Update results
mysql-test/r/null_key.result:
  Update results
scripts/mysqld_safe.sh:
  Don't apply NICE handling change from 3.23
sql/mysqld.cc:
  merge
sql/opt_range.cc:
  merge
support-files/mysql.server.sh:
  Don't apply changes from 3.23
2002-11-24 16:37:41 +02:00
unknown
0b19cb1e2d Do-compile:
- applied some changes from the 4.0 tree (enable multiple 
   --conf-environment options, add --with-debug, don't add "-max"
   prefix just because BDB is enabled)


Build-tools/Do-compile:
   - applied some changes from the 4.0 tree (enable multiple 
     --conf-environment options, add --with-debug, don't add "-max"
     prefix just because BDB is enabled)
2002-11-20 22:16:29 +01:00