Commit graph

295 commits

Author SHA1 Message Date
unknown
9175e5a8f3 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-02-23 23:53:48 -06:00
unknown
6294c68ee4 Bootstrap:
Add new manual.texi include files


Build-tools/Bootstrap:
  Add new manual.texi include files
2005-02-23 23:44:13 -06:00
unknown
003e7ad18c Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0
mysql-test/mysql-test-run.pl:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
2005-02-17 10:56:20 +01:00
unknown
a20f238287 Do-hpux-depot:
Perl script to create HP depot packages.
2005-02-17 02:57:40 -06:00
unknown
12e4d1c8db Merge mysql.com:/M41/upward-4.1 into mysql.com:/M50/merge-5.0
Build-tools/Do-compile:
  Auto merged
2005-02-11 13:00:17 +01:00
unknown
12df0887b1 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
Build-tools/Do-compile:
  Auto merged
2005-02-11 10:40:10 +01:00
unknown
8cd6d181ef Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M40/push-4.0 2005-02-10 14:34:36 +01:00
unknown
2e480773c8 Change 'Build-tools/Do-compile' from 'system("rm -f ...");' to 'unlink()' to ensure
it also works on file names with special characters.


Build-tools/Do-compile:
  Ever and again, some test creates a file name with special characters that need to be
  escaped when passed to the shell; as this is not done, 'system("rm -f ...");' fails
  on them, the old test tree is not deleted, and the build fails.
  Prevent this by changing to Perl 'unlink()' which does not need escaping.
2005-02-10 14:33:27 +01:00
unknown
e7f3cfb31f Merge mysql.com:/space/my/mysql-4.1-merge
into mysql.com:/space/my/mysql-5.0


mysql-test/Makefile.am:
  Auto merged
2005-02-09 17:52:31 +01:00
unknown
4ebc8efc91 - added copyright header on top of the fill_help_tables.sql file (BUG#5772)
- updated mysql-copyright-2 to properly convert this new header from GPL to commercial for the
  commercial distribution


Build-tools/mysql-copyright-2:
  - added functionality to replace a copyright header in .sql files, too (needed for updating
    scripts/fill_help_tables.sql in the commercial source distribution)
scripts/fill_help_tables.sh:
  - added copyright header on top of the fill_help_tables.sql file (BUG#5772)
2005-02-09 17:40:10 +01:00
unknown
d422094c0a Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-02-07 02:19:29 -06:00
unknown
e4add35d34 Do-solaris-pkg:
Minor tweaks to work properly


Build-tools/Do-solaris-pkg:
  Minor tweaks to work properly
2005-02-07 02:18:12 -06:00
unknown
e7bac81f01 Merge here.mwagner.org:/Users/mwagner/work/bk/mysql-4.1
into here.mwagner.org:/Users/mwagner/work/bk/mysql-5.0
2005-02-07 01:41:48 -06:00
unknown
d3a6f130e2 Do-solaris-pkg:
Deposit the new .pkg.gz into the ~/$hostname/ directory


Build-tools/Do-solaris-pkg:
  Deposit the new .pkg.gz into the ~/$hostname/ directory
2005-02-07 01:27:58 -06:00
unknown
b19ff40dda Do-solaris-pkg:
Perl script to create Solaris installation packages.
2005-02-07 00:12:46 -06:00
unknown
4f1cbb6031 4.1 -> 5.0 merge
BitKeeper/etc/logging_ok:
  auto-union
Build-tools/Do-compile:
  Auto merged
client/mysqladmin.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
configure.in:
  Auto merged
extra/perror.c:
  Auto merged
innobase/buf/buf0rea.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/include/rem0rec.ic:
  Auto merged
innobase/include/univ.i:
  Auto merged
innobase/os/os0file.c:
  Auto merged
innobase/ut/ut0ut.c:
  Auto merged
mysql-test/r/derived.result:
  Auto merged
mysql-test/r/func_str.result:
  Simple merge
mysql-test/r/subselect.result:
  Automatic merge
mysql-test/t/derived.test:
  Automatic merge
mysql-test/t/func_str.test:
  Simple merge
mysql-test/t/subselect.test:
  Automatic merge
mysys/my_handler.c:
  Automatic merge
ndb/src/kernel/blocks/backup/Backup.cpp:
  Automatic merge
scripts/make_binary_distribution.sh:
  Automatic merge
scripts/mysql_install_db.sh:
  Automatic merge
sql/examples/ha_archive.cc:
  Simple merge
sql/ha_innodb.cc:
  Automatic merge
sql/item.cc:
  Merge
sql/item_cmpfunc.h:
  Automatic merge
sql/item_func.cc:
  Simple merge
sql/item_func.h:
  Automatic merge
sql/item_strfunc.cc:
  Automatic merge
sql/item_strfunc.h:
  Automatic merge
sql/item_subselect.cc:
  Automatic merge
sql/mysqld.cc:
  Automatic merge
sql/set_var.cc:
  Automatic merge
sql/sql_base.cc:
  Automatic merge
sql/sql_class.cc:
  Automatic merge
sql/sql_class.h:
  Automatic merge
sql/sql_lex.cc:
  Automatic merge
sql/sql_lex.h:
  Automatic merge
sql/sql_parse.cc:
  Automatic merge
sql/sql_select.cc:
  Automatic merge
sql/sql_table.cc:
  Automatic merge
sql/sql_update.cc:
  Simple merge
strings/ctype-big5.c:
  Automatic merge
strings/ctype-bin.c:
  Automatic merge
strings/ctype-gbk.c:
  Automatic merge
strings/ctype-latin1.c:
  Automatic merge
strings/ctype-mb.c:
  Automatic merge
strings/ctype-simple.c:
  Automatic merge
strings/ctype-sjis.c:
  Automatic merge
strings/ctype-tis620.c:
  Automatic merge
strings/ctype-ucs2.c:
  Automatic merge
strings/ctype-utf8.c:
  Automatic merge
vio/viosocket.c:
  Automatic merge
vio/viossl.c:
  Automatic merge
2005-02-03 13:18:30 +02:00
unknown
7116beb95d Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Build-tools/Bootstrap:
  Auto merged
2005-02-02 19:25:43 +01:00
unknown
d4ac4cb112 - typo fix... 2005-02-02 19:23:24 +01:00
unknown
d2784c988f Small Do-compile improvements:
- added Option "--comment" to be able to override the default compilation comment
- improved the abort subroutine to not rely on an external "tail" command (the
  default /usr/bin/tail on Solaris does not understand the "-n" notation).
  Get rid of a "useless use of cat" case in the process.


Build-tools/Do-compile:
  - added Option "--comment" to be able to override the default compilation comment
  - improved the abort subroutine to not rely on an external "tail" command (the
    default /usr/bin/tail on Solaris does not understand the "-n" notation).
    Get rid of a "useless use of cat" case in the process.
2005-02-02 13:40:17 +01:00
unknown
d59bc7f47a Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1
Build-tools/Bootstrap:
  Auto merged
2005-02-01 13:19:21 +01:00
unknown
0f7fae73d1 - Bootstrap: Rename already existing build directories to something more
useful than *.old.<PID> - use the mtime of configure.in instead. 
  This gives us a time stamp of when this last build directory was created,
  e.g. "mysql-4.0.24-build-2005-01-31-16:47"


Build-tools/Bootstrap:
  - Rename already existing build directories to something more useful than
    *.old.<PID> - use the mtime of configure.in instead. This gives us a time
    stamp of when this last build directory was created, e.g.
    "mysql-4.0.24-build-2005-01-31-16:47"
2005-01-31 17:33:01 +01:00
unknown
a6bfe13c6f Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0


Build-tools/Do-compile:
  Auto merged
configure.in:
  Auto merged
2005-01-28 02:07:13 +01:00
unknown
418a06308b Do-compile:
ndbcluster requires more ports, this is the reason why builds will not start on multiple builds


Build-tools/Do-compile:
  ndbcluster requires more ports, this is the reason why builds will not start on multiple builds
2005-01-28 02:06:27 +01:00
unknown
2ac6a8f757 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-20 12:21:10 +01:00
unknown
933d80d4ff Merge mysql.com:/space/my/mysql-4.0 into mysql.com:/space/my/mysql-4.1 2005-01-20 12:09:17 +01:00
unknown
89a24f9335 - Improved Do-rpm to perform RPM builds inside of a chrooted build
environment (using "build" on SUSE Linux)


Build-tools/Do-rpm:
  - added functionality to perform RPM builds inside of a chrooted build
    environment (using "build" on SUSE Linux) - see "--help" for more details
2005-01-20 12:07:44 +01:00
unknown
484dd6e516 Merge mysql.com:/space/my/mysql-4.1 into mysql.com:/space/my/mysql-5.0 2005-01-18 12:09:27 +01:00
unknown
5854c32283 Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.1-build


Build-tools/Do-pkg:
  Auto merged
2005-01-17 18:53:10 +01:00
unknown
57f7c497cf - Enabled the handling of architecture extensions e.g. "-64bit" when building
Mac OS X PKGs with Do-pkg


Build-tools/Do-pkg:
  - enable handling of architecture extensions e.g. "-64bit"
2005-01-17 17:22:17 +01:00
unknown
2f246d2ff6 Merge with global tree
BitKeeper/etc/ignore:
  auto-union
Build-tools/Do-compile:
  Auto merged
configure.in:
  Auto merged
innobase/include/row0mysql.h:
  Auto merged
innobase/os/os0file.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/ctype_latin1_de.result:
  Auto merged
mysql-test/r/ctype_tis620.result:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/r/ctype_ujis.result:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/ps_1general.result:
  Auto merged
mysql-test/r/show_check.result:
  Auto merged
mysql-test/r/type_float.result.es:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ps_1general.test:
  Auto merged
mysql-test/t/show_check.test:
  Auto merged
ndb/src/kernel/vm/Configuration.cpp:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/field.cc:
  Auto merged
sql/filesort.cc:
  Auto merged
sql/ha_berkeley.cc:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-bin.c:
  Auto merged
strings/ctype-czech.c:
  Auto merged
strings/ctype-gbk.c:
  Auto merged
strings/ctype-latin1.c:
  Auto merged
strings/ctype-mb.c:
  Auto merged
strings/ctype-simple.c:
  Auto merged
strings/ctype-sjis.c:
  Auto merged
strings/ctype-tis620.c:
  Auto merged
strings/ctype-uca.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
strings/ctype-utf8.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
sql/sql_show.cc:
  No changes
strings/ctype-cp932.c:
  No changes
support-files/mysql.spec.sh:
  No changes
2005-01-15 14:39:16 +02:00
unknown
18df9d391f - make sure to enable "--without-ndb-debug" when both --debug and
--with-cluster are provided. Yes, this sounds like a contradiction -
  enabling debugging in NBD enables code parts that may still reveal 
  portability issues when compiled with non-gcc compilers. (request by TomasU)
2005-01-14 15:35:32 +01:00
unknown
ee85947744 - added option "--with-federated" to Do-compile to enable building of the
Federated Storage Engine (as requested by Brian)
- added the federated storage engine to the Max Linux RPM


Build-tools/Do-compile:
  - added option "--with-federated" to enable building of the Federated
    Storage Engine (as requested by Brian)
support-files/mysql.spec.sh:
  - enabled the federated storage engine for the Max RPM subpackage
2005-01-13 12:03:12 +01:00
unknown
d862f84643 - Modified Do-compile to run the test suite with ps-protocol and against
the embedded server by default (if included). These additional steps can
  be skipped by providing "--skip-embedded-test" and "--skip-ps-test"


Build-tools/Do-compile:
  - enabled running the test suite with ps-protocol and against the embedded
    server by default (if included). These additional steps can be skipped
    by providing "--skip-embedded-test" and "--skip-ps-test"
2005-01-12 13:06:06 +01:00
unknown
7a35921bff Merge mysql.com:/home/mysql_src/mysql-4.0
into mysql.com:/home/mysql_src/mysql-4.1-clean


Build-tools/Bootstrap:
  Auto merged
sql/net_serv.cc:
  Auto merged
2005-01-10 14:13:41 +01:00
unknown
0ef65db5d7 - Updated Do-pkg to include the MySQL Preference Pane into the Mac OS X
installation disk images


Build-tools/Do-pkg:
  - added code to include the MySQLPreferencePane into the installation
    disk image (can be skipped by using --skip-prefpane)
2005-01-07 12:29:15 +01:00
unknown
04498c2a4f Bootstrap:
Made the default --mail address to be <build@mysql.com>.


Build-tools/Bootstrap:
  Made the default --mail address to be <build@mysql.com>.
2005-01-06 22:30:23 -06:00
unknown
a35b65375f Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.1-build


Build-tools/Bootstrap:
  Auto merged
2005-01-03 21:37:41 +01:00
unknown
7b7216e1f4 - Updated Bootstrap to include merge ChangeSets in the source distribution's
ChangeLog, too (to be more exact when tagging a release that's based on a
  merge ChangeSet)


Build-tools/Bootstrap:
  - include merge ChangeSets into the ChangeLog, too (to be more exact when
    tagging a release that's based on a merge ChangeSet)
2005-01-03 21:28:14 +01:00
unknown
74ddae773a Merge mysql.com:/space/my/mysql-4.0
into mysql.com:/space/my/mysql-4.1-build


Build-tools/Bootstrap:
  Auto merged
2004-12-31 12:57:05 +01:00
unknown
54b768472c - Bootrap now uses "compile-dist" by default to create the source distribution
Build-tools/Bootstrap:
  - Use BUILD/compile-dist instead of compile-pentium-max
  - some minor cleanups
2004-12-31 12:46:18 +01:00
unknown
c4be610466 Do-compile:
Added --with-csv and --with-example for CSV and Example storage engines


Build-tools/Do-compile:
  Added --with-csv and --with-example for CSV and Example storage engines
2004-12-09 19:47:41 +01:00
unknown
b5e844468c - added two new options to Do-compile:
--ps-test: run the test suite using prepared statements
  --embedded-test: run the test suite against the embedded server


Build-tools/Do-compile:
  - added two new options:
    --ps-test: run the test suite using prepared statements
    --embedded-test: run the test suite against the embedded server
2004-12-08 19:34:11 +01:00
unknown
fbafcb2c0e - added option --with-archive to enable compiling with the Archive Storage
Engine
2004-12-02 18:55:10 +01:00
unknown
4221f04ab6 Merged 4.0 change into 4.1
Build-tools/Do-compile:
  Merged new default "--force" (can be switched off using "--one-error") from 4.0 into 4.1
2004-11-24 13:04:13 +01:00
unknown
a9aff01ebd Change "Do-compile" to make automatic build log analysis easier and
to run the standard tests with "--force" (default, can be switched off).


Build-tools/Do-compile:
  1) For an automated log analysis, we need a clear marker in the build log
     whether compile + link succeeded: Write it after successful "make".
  2) Ensure the standard tests are run with "--force" in the default case,
     but allow the old behaviour by an option "--one-error".
  3) Correct a typing error in the usage message.
2004-11-23 17:18:41 +01:00
unknown
44070705ea merge with 4.0
BitKeeper/etc/logging_ok:
  auto-union
BitKeeper/deleted/.del-Makefile.am:
  Delete: Docs/Images/Makefile.am
Build-tools/Bootstrap:
  Auto merged
Docs/Makefile.am:
  Auto merged
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysys/default.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/log.cc:
  Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
client/mysqldump.c:
  merge with 4.0
  (This only reorders options)
sql/ha_innodb.cc:
  merge with 4.0 (Keep original code)
sql/time.cc:
  Note that part of this patch is done in my_time.c
2004-11-12 11:17:53 +02:00
unknown
8d5703a3c7 Change "Bootstrap" so that it will not fail on BK source trees of other versions;
this is important because this 4.0 "Bootstrap" is the one generally used on host "build".


Build-tools/Bootstrap:
  If the source tree does not contain any "Docs/Images/Makefile*" (due to an error,
  or because it is not yet prepared to contain the Images in the source tar-ball),
  a plain "rm" will fail and so cause "Bootstrap" to fail. (This has happened ...)
  Prevent this danger by using "rm -f".
2004-11-05 15:22:03 +01:00
unknown
0dd1ab1abb The files stored in "Docs/Images" within the "mysqldocs" BK tree must be included
in the source tar-ball for distribution. This is done by using the "DISTFILES" macro
in a new "Docs/Images/Makefile". As the source BK tree does not contain these files,
they are copied from the "mysqldocs" tree at release build time.
This changeset relies on "bk commit - mysqldoc tree (joerg:1.2276)" of today.


Build-tools/Bootstrap:
  Copy the relevant files with "Docs/Images" from the "mysqldocs" BK tree into the
  build tree, ensuring that the "Makefile*" from the source BK tree are removed before.
Docs/Images/Makefile.am:
  This dummy file is only needed to satisfy the Makefile hierarchy, 
  at release build time it will be replaced by its counterpart from the "mysqldocs" BK tree.
Docs/Makefile.am:
  Include the new "Docs/Images/Makefile" in the Makefile hierarchy.
configure.in:
  Ensure that the autotools will handle the new "Docs/Images/Makefile.am".
2004-11-04 11:18:12 +01:00
unknown
d43421155e Change 'Build-tools/mysql-copyright' to ensure the receiving machines will build
without trying to re-run autotools.
(Backport from 4.1.7 for 4.0.22)


Build-tools/mysql-copyright:
  The top level Makefile will try to re-run the autotools unless the timestamps of the
  relevant files are in truly ascending order. Ensure this order!
  (Backport from 4.1.7 for 4.0.22)
2004-10-27 17:54:10 +02:00
unknown
2df0eca2b6 Change 'Build-tools/mysql-copyright' to ensure the receiving machines will build
without trying to re-run autotools.


Build-tools/mysql-copyright:
  The top level Makefile will try to re-run the autotools unless the timestamps of the
  relevant files are in truly ascending order. Ensure this order!
2004-10-25 22:15:45 +02:00