Commit graph

588 commits

Author SHA1 Message Date
unknown
8e60a6a47a make_win_src_distribution.sh:
Convert to DOS EOL if dsp/dsw is in package


scripts/make_win_src_distribution.sh:
  Convert to DOS EOL if dsp/dsw is in package
2006-05-29 20:09:22 +02:00
unknown
7ef9eb1c2c make_sharedlib_distribution.sh:
Solaris sh don't like {..} in file matching


scripts/make_sharedlib_distribution.sh:
  Solaris sh don't like {..} in file matching
2006-05-23 00:50:39 +02:00
unknown
d2744ebcfd Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-new


scripts/mysql_install_db.sh:
  Auto merged
2006-04-03 03:40:54 +02:00
unknown
e2b19a59d2 mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:
Changed web address order.mysql.com to shop.mysql.com


netware/mysql_install_db.c:
  Changed web address order.mysql.com to shop.mysql.com
Docs/MySQLEULA.txt:
  Changed web address order.mysql.com to shop.mysql.com
scripts/mysql_install_db.sh:
  Changed web address order.mysql.com to shop.mysql.com
2006-04-03 03:37:43 +02:00
unknown
2d8acd2fdc mysqld_safe.sh:
Added --help option, bug#16392
acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332


acinclude.m4:
  Use "$shrext_cmds" when testing if shared library exists, bug#16332
scripts/mysqld_safe.sh:
  Added --help option, bug#16392
2006-03-29 23:51:23 +02:00
unknown
0fb36d1b1e mysql_config.sh:
If installed, search built in lib path first, bug#13158


scripts/mysql_config.sh:
  If installed, search built in lib path first, bug#13158
2006-03-29 14:59:53 +02:00
unknown
7130316d15 mysql_config.sh:
Remove Solaris -xc99=none C option as C++ compiler can't handle it


scripts/mysql_config.sh:
  Remove Solaris -xc99=none C option as C++ compiler can't handle it
2006-03-27 23:04:44 +02:00
unknown
53aadad668 mysql_config.sh:
We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322


scripts/mysql_config.sh:
  We are not to control what malloc package others are to use, remove -lmtmalloc from --libs(_r), bug#18322
2006-03-27 19:25:25 +02:00
unknown
b7ca534215 Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1
scripts/make_binary_distribution.sh:
  Auto merged
2006-03-02 10:48:46 +01:00
unknown
cd93a5aafa make_binary_distribution.sh:
print => echo in shell script


scripts/make_binary_distribution.sh:
  print => echo in shell script
2006-02-12 01:33:43 +01:00
unknown
ddab016fc4 Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1
extra/comp_err.c:
  Auto merged
scripts/mysqld_multi.sh:
  Auto merged
2006-01-13 17:45:01 +01:00
unknown
de4a3552e1 extra/comp_err.c + scripts/mysqld_multi.sh :
Copyright string fixes (bug#16106)


extra/comp_err.c:
  Ensure that the license spelling is as expected by the "mysql_copyright" tool.
  (bug#16106)
scripts/mysqld_multi.sh:
  The "mysql_copyright" tool will not change non-C files, so do not mention the license.
  (bug#16106)
2006-01-13 16:25:20 +01:00
unknown
3551761c3d Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1
2005-12-15 00:43:41 +01:00
unknown
1204669620 Minor Netware specific changes.
netware/BUILD/compile-linux-tools:
  Fixed compilation problem with Linux tools.
scripts/make_binary_distribution.sh:
  Netware specific changes. Discard platform
  specific files and added a couple of missing files.
sql/tztime.cc:
  Code not ported to Netware yet.
2005-12-13 18:30:10 +02:00
unknown
ff410f95f5 make_win_src_distribution.sh:
Removed Visual Studio 6 project files, as they are not maintained


scripts/make_win_src_distribution.sh:
  Removed Visual Studio 6 project files, as they are not maintained
2005-12-11 09:21:13 +01:00
unknown
34bbdf0613 Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


configure.in:
  Auto merged
2005-11-19 11:11:09 +01:00
unknown
cde1be69d6 Merge mysql.com:/home/jimw/my/mysql-4.1-14469
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-11-10 11:23:52 -08:00
unknown
b0701a5c3b Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck


Makefile.am:
  Auto merged
configure.in:
  Auto merged
mysql-test/Makefile.am:
  Auto merged
2005-11-04 01:15:35 +01:00
unknown
04fcd58e09 Fix harmless typo in mysql_fix_privilege_tables.sql (Bug #14469)
scripts/mysql_fix_privilege_tables.sql:
  Remove extra leading - in comment
2005-10-31 15:56:52 -08:00
unknown
ff546eed4b Handle decision to use mysqld-max over mysqld within mysqld_safe
even when --ledir option is specified. (Bug #13774)


scripts/mysqld_safe.sh:
  Figure out whether to use mysqld or mysqld-max after we have handled
  the command-line options and .cnf files.
2005-10-31 11:15:44 -08:00
unknown
cd04dcd7bc Some Netware related fixes and fixes for Metrowerks compiler.
netware/BUILD/mwenv:
  Removed -O3 for Metrowerks compiler.
netware/pack_isam.def:
  NetWare specific change, Added SCRENNAME for pack_isam.
scripts/make_binary_distribution.sh:
  Netware specific change for creating help tables.
strings/my_strtoll10.c:
  Fix for Metrowerks compiler.
2005-10-13 17:21:14 +03:00
unknown
7d86879442 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


scripts/make_win_src_distribution.sh:
  Auto merged
2005-10-11 21:24:01 +02:00
unknown
28dffbcd66 - added Docs/manual.chm to the windows source distribution (BUG#13899)
scripts/make_win_src_distribution.sh:
  - added Docs/manual.chm to the windows source distribution (BUG#13899). The file
    is placed in there by the Bootstrap script, which pulls it from the mysqldoc
    repository
2005-10-11 21:16:08 +02:00
unknown
c533a6bf04 make_binary_distribution.sh:
Copy zlib.a and valgrind.supp if exists
  Copy disabled.def


scripts/make_binary_distribution.sh:
  Copy zlib.a and valgrind.supp if exists
2005-10-07 13:08:07 +02:00
unknown
2d017ee897 make_binary_distribution.sh:
Corrected platform name output
Services.cpp:
  Dont print null address (back port from 5.0)


ndb/src/mgmsrv/Services.cpp:
  Dont print null address (back port from 5.0)
scripts/make_binary_distribution.sh:
  Corrected platform name output
2005-10-07 01:56:11 +02:00
unknown
707a4b6539 make_binary_distribution.sh:
Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable


scripts/make_binary_distribution.sh:
  Reintroduced --machine
  Better sh compatibility, "for i ; do" is not portable
2005-10-06 22:57:13 +02:00
unknown
78f5997ade make_binary_distribution.sh:
Replaced --machine with --platform
  General code cleanup


scripts/make_binary_distribution.sh:
  Replaced --machine with --platform
  General code cleanup
2005-10-06 18:00:23 +02:00
unknown
b446550e2c Many files:
New VC7 project files
des_key_file.cc:
  Visual C++ wants '"' for local include
mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver


VC++Files/mysqlserver/dummy.cpp:
  Added to convince VS .Net generate a lib for mysqlserver
VC++Files/bdb/bdb.vcproj:
  New VC7 project files
VC++Files/client/mysql.vcproj:
  New VC7 project files
VC++Files/client/mysqladmin.vcproj:
  New VC7 project files
VC++Files/client/mysqlclient.vcproj:
  New VC7 project files
VC++Files/client/mysqldump.vcproj:
  New VC7 project files
VC++Files/client/mysqlimport.vcproj:
  New VC7 project files
VC++Files/client/mysqlshow.vcproj:
  New VC7 project files
VC++Files/client/mysqltest.vcproj:
  New VC7 project files
VC++Files/comp_err/comp_err.vcproj:
  New VC7 project files
VC++Files/dbug/dbug.vcproj:
  New VC7 project files
VC++Files/heap/heap.vcproj:
  New VC7 project files
VC++Files/innobase/innobase.vcproj:
  New VC7 project files
VC++Files/libmysql/libmysql.vcproj:
  New VC7 project files
VC++Files/libmysqld/examples/test_libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqld/libmysqld.vcproj:
  New VC7 project files
VC++Files/libmysqltest/myTest.vcproj:
  New VC7 project files
VC++Files/my_print_defaults/my_print_defaults.vcproj:
  New VC7 project files
VC++Files/myisam/myisam.vcproj:
  New VC7 project files
VC++Files/myisam_ftdump/myisam_ftdump.vcproj:
  New VC7 project files
VC++Files/myisamchk/myisamchk.vcproj:
  New VC7 project files
VC++Files/myisamlog/myisamlog.vcproj:
  New VC7 project files
VC++Files/myisammrg/myisammrg.vcproj:
  New VC7 project files
VC++Files/myisampack/myisampack.vcproj:
  New VC7 project files
VC++Files/mysql-test/mysql_test_run_new.vcproj:
  New VC7 project files
VC++Files/mysql.sln:
  New VC7 project files
VC++Files/mysqlbinlog/mysqlbinlog.vcproj:
  New VC7 project files
VC++Files/mysqlcheck/mysqlcheck.vcproj:
  New VC7 project files
VC++Files/mysqldemb/mysqldemb.vcproj:
  New VC7 project files
VC++Files/mysqlserver/mysqlserver.vcproj:
  New VC7 project files
VC++Files/mysys/mysys.vcproj:
  New VC7 project files
VC++Files/perror/perror.vcproj:
  New VC7 project files
VC++Files/regex/regex.vcproj:
  New VC7 project files
VC++Files/replace/replace.vcproj:
  New VC7 project files
VC++Files/sql/mysqld.vcproj:
  New VC7 project files
VC++Files/strings/strings.vcproj:
  New VC7 project files
VC++Files/test1/test1.vcproj:
  New VC7 project files
VC++Files/tests/mysql_client_test.vcproj:
  New VC7 project files
VC++Files/thr_test/thr_test.vcproj:
  New VC7 project files
VC++Files/vio/vio.vcproj:
  New VC7 project files
VC++Files/zlib/zlib.vcproj:
  New VC7 project files
client/mysql.cc:
  Cast my_cgets() argument for VC6 and VC7
sql/des_key_file.cc:
  Visual C++ wants '"' for local include
scripts/make_win_src_distribution.sh:
  New VC7 project files
2005-09-30 14:03:55 +02:00
unknown
86856939c4 mysql_config.sh:
Added -lz to link using libmysqld


scripts/mysql_config.sh:
  Added -lz to link using libmysqld
2005-09-28 13:39:28 +02:00
unknown
5409f2554f Makefile.am, configure.in:
Enable "make distcheck" to work


configure.in:
  Enable "make distcheck" to work
Docs/Makefile.am:
  Enable "make distcheck" to work
Makefile.am:
  Enable "make distcheck" to work
client/Makefile.am:
  Enable "make distcheck" to work
cmd-line-utils/libedit/Makefile.am:
  Enable "make distcheck" to work
include/Makefile.am:
  Enable "make distcheck" to work
libmysql/Makefile.am:
  Enable "make distcheck" to work
libmysql_r/Makefile.am:
  Enable "make distcheck" to work
libmysqld/Makefile.am:
  Enable "make distcheck" to work
libmysqld/examples/Makefile.am:
  Enable "make distcheck" to work
mysql-test/Makefile.am:
  Enable "make distcheck" to work
ndb/docs/Makefile.am:
  Enable "make distcheck" to work
netware/Makefile.am:
  Enable "make distcheck" to work
pstack/Makefile.am:
  Enable "make distcheck" to work
scripts/Makefile.am:
  Enable "make distcheck" to work
sql-bench/Makefile.am:
  Enable "make distcheck" to work
sql/Makefile.am:
  Enable "make distcheck" to work
sql/share/Makefile.am:
  Enable "make distcheck" to work
support-files/Makefile.am:
  Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
unknown
3614cff71c Makefile.am:
Revert to shell test script for test targets
mysqltest.c:
  Windows pclose() returns error code in low byte
mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++


scripts/mysql_config.sh:
  Remove -Xa -xstrconst from --cflags for Sun C++
client/mysqltest.c:
  Windows pclose() returns error code in low byte
Makefile.am:
  Revert to shell test script for test targets
2005-09-24 02:42:38 +02:00
unknown
cbb1da77cf Merge mysql.com:/home/jimw/my/mysql-4.1-11280
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-02 12:12:36 -07:00
unknown
b513103619 Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1
scripts/Makefile.am:
  Auto merged
2005-09-01 21:36:16 +02:00
unknown
dedb5b7931 Add "MYSQL_BASE_VERSION" to the list of substituted variables in the "scripts" subdirectory.
scripts/Makefile.am:
  Add "MYSQL_BASE_VERSION" to the list of substituted variables,
  for later (possible) use in "mysql_install_db" and "mysqld_safe".
2005-09-01 20:01:21 +02:00
unknown
bcc9c6fd93 Fix quoting of options passed to external commands by mysqld_multi. (Bug #11280)
scripts/mysqld_multi.sh:
  Fix quoting of options passed to mysqld and mysqladmin
2005-08-31 10:23:29 -07:00
unknown
fe862aa987 - merge from 4.0: updated scripts/Makefile.am to properly create but not install
make_binary_distribution, make_sharedlib_distribution and make_win_src_distribution
- removed make_win_binary_distribution.sh


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Auto merged
scripts/Makefile.am:
  - after merge fix: removed the "all" target - these files are now built via
    noinst_SCRIPTS instead.
2005-07-25 14:39:23 +02:00
unknown
1f36f6f45b - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
make_win_src_distribution are created, but not installed
- removed make_win_binary_distribution.sh as it's obsolete and outdated


BitKeeper/deleted/.del-make_win_binary_distribution.sh~e0fbb0a75af0dcd3:
  Delete: scripts/make_win_binary_distribution.sh
scripts/Makefile.am:
  - Make sure the scripts make_binary_distribution, make_sharedlib_distribution and
    make_win_src_distribution are created, but not installed. This is the proper fix
    for what I began in the previous ChangeSet
  - removed make_win_binary_distribution.sh from the distribution, as it's obsolete
    and outdated
2005-07-25 14:14:24 +02:00
unknown
d207bd81f8 - 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


scripts/Makefile.am:
  - don't install the following files with "make install", as they are
    not needed to be installed: 
    make_win_src_distribution, make_win_binary_distribution,
    make_binary_distribution, make_sharedlib_distribution
support-files/MacOSX/Makefile.am:
  - don't install the Mac OS X support files when running "make install" -
    they're not needed outside of the source tree (BUG#12057)
support-files/Makefile.am:
  - don't install the RPM spec files with "make install" - they are not
    needed outside of the source tree
2005-07-20 19:15:48 +02:00
unknown
abcd8b032c Merge mysql.com:/home/jimw/my/mysql-4.1-7249
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-19 10:35:15 -07:00
unknown
284e241c46 - reverted adding mysql-test/t/*.def to the distribution (it is not supported in 4.1
at all)
2005-07-08 21:04:54 +02:00
unknown
3d2814d6d4 - added mysql-test/t/*.def to the source and binary distributions
mysql-test/Makefile.am:
  - added mysql-test/t/*.def to the source distribution and make sure that "make install"
    installs it, too.
scripts/make_binary_distribution.sh:
  - added mysql-test/t/*.def to the binary distribution
2005-07-08 11:07:05 +02:00
unknown
81c31e3b00 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


scripts/make_binary_distribution.sh:
  Auto merged
2005-07-06 14:00:24 +02:00
unknown
2a04d15596 - backported a change for make_binary_distribution.sh from 5.0 for easier building of
all versions: added an option "--machine" that allows to override the autodetected
  architecture string (e.g. "i386") that becomes part of the binary package name with 
  a different one
- moved the removal of the BASE directory to the end of the make_binary_distribution
  script


scripts/make_binary_distribution.sh:
  - backported and fixed a change from 5.0 for easier building of all versions: added an
    option "--machine" that allows to override the autodetected architecture string 
    (e.g. "i386") that becomes part of the binary package name with a different one
  - moved the removal of the BASE directory to the end of the script
2005-07-06 13:58:29 +02:00
unknown
a27b5b31fc Merge mysql.com:/home/jimw/my/mysql-4.1-10986
into  mysql.com:/home/jimw/my/mysql-4.1-clean
2005-07-05 12:56:47 -07:00
unknown
5c42918118 make_win_src_distribution.sh:
Bug#11009, some more cleanup of unneded files from bootstrap


scripts/make_win_src_distribution.sh:
  Bug#11009, some more cleanup of unneded files from bootstrap
2005-06-28 05:25:29 +02:00
unknown
11d2bb945f If mysql_config is a symlink, resolve it before trying to find the lib and
include directories relative to where it is located. (Bug #10986)


scripts/mysql_config.sh:
  If mysql_config is a symlink, try to resolve it
2005-06-24 17:59:19 -07:00
unknown
3e7a57632a Fix handling of datadir by mysqld_safe to support specifying a
different DATADIR via the command line or during ./configure and
still starting up mysqld_safe via a relative path. (Bug #7249)


scripts/mysqld_safe.sh:
  Decouple figuring out which BASEDIR and DATADIR to use so that
  the only DATADIR we'll try to use without first verifying that
  it exists is the compiled-in default.
2005-06-24 17:14:16 -07:00
unknown
9f1610638b Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-06-07 11:41:55 +02:00
unknown
af72f54b53 - 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)


scripts/Makefile.am:
  - no need to install "make_win_src_distribution" and "make_win_binary_distribution"
    in "make install" (BUG#10676)
support-files/mysql.spec.sh:
  - added mysql_client_test to the "bench" subpackage (BUG 10676)
  - use "mysqldatadir" variable instead of hard-coding the path multiple times
  - use the "mysqld_user" variable on all occasions a user name is referenced
  - removed (incomplete) Brazilian translations
  - removed redundant release tags from the subpackage descriptions
2005-06-07 10:25:51 +02:00
unknown
d09d815649 BUG#7967 Fix mysqlhotcopy --record-log-position
BitKeeper/etc/ignore:
  Added scripts/mysqlhotcopy.sh.rej to the ignore list
scripts/mysqlhotcopy.sh:
  BUG#7967 Use fetchrow_hashref() when parsing SHOW SLAVE STATUS so
  that --record-log-pos option will work with all versions from 3.23
  forward and will not break again in the future if additional columns
  are added.
2005-06-06 22:17:16 -04:00