Commit graph

288 commits

Author SHA1 Message Date
unknown
944666ef1d Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
2005-09-01 14:09:23 +02:00
unknown
e4cfbaed51 Bug #12717 yassl: Crashes in "integer.cpp" when compiled with icc
- Temporary fix, disable x86 assembler.


BUILD/compile-pentium-icc:
  Cleanup build script for icc
extra/yassl/taocrypt/include/misc.hpp:
  Disable x86 assembler  when compiling with icc
BUILD/compile-pentium-icc-yassl:
  New BitKeeper file ``BUILD/compile-pentium-icc-yassl''
2005-09-01 14:07:45 +02:00
unknown
b2344cd5f9 added file missing from release to EXTRA_DIST list (bug# 12733) 2005-08-22 22:13:56 +02:00
unknown
f2cc5f25eb Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0
into  zim.(none):/home/brian/mysql/mysql-5.0
2005-08-16 18:39:16 -07:00
unknown
bb65b80014 Adding support for opteron optimization in build files. 2005-07-20 22:52:15 -07:00
unknown
c682570431 Fix BUILD/autorun.sh to really bail out on error.
BUILD/autorun.sh:
  Make exit on error actually work.
2005-07-18 21:33:05 +04:00
unknown
48995b9ab8 Added federated to max base test.
BUILD/SETUP.sh:
  Added federated to base_max tests.
2005-07-15 17:36:20 -07:00
unknown
ba52e741de Removed dead options, fixed pentium script to no longer ask for isam (its not included in 5.0).
BUILD/SETUP.sh:
  Removed dead options, added blackhole option
BUILD/compile-pentium-debug-max-no-embedded:
  Updated option to remove unused option
2005-07-15 11:15:44 -07:00
unknown
9603529881 Added a test for glibtoolize so that the autoconf tools that come installed on OSX will work fine (so no need to replace them).
BUILD/autorun.sh:
  Added a test for glibtoolize. This will fix issues with compiling on OSX
2005-07-11 09:52:19 -07:00
unknown
6f1db965ad merge 2005-06-07 12:44:00 +10:00
unknown
2da5ba707f Fix BUILD/check-cpu for powerpc
BUILD/check-cpu:
  fix for powerpc linux
2005-06-06 10:56:20 +10:00
unknown
32c9799596 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0
2005-06-03 19:15:16 +02:00
unknown
fcb3be9f63 check-cpu fixes/improvements (Bug #11065)
- support additional platforms (OpenBSD, Darwin)
    - make use of /proc/cpuinfo CPU flag information
      (needed to distinguish EMT64 Xeons from normal ones)
    - chose the right CPU related options depending on 
      GCC version and target architecture
    - check if the chosen CPU type is actually supported
      by the GCC version , fallback to CPUs predecessor
      until test compile succeeds
2005-06-03 11:21:43 +02:00
unknown
33992678e2 Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1
into mysql.com:/home/hartmut/projects/mysql/dev/5.0


BUILD/Makefile.am:
  Auto merged
2005-06-03 10:35:14 +02:00
unknown
9979feb35c bundle the check-cpu helper script with source packages.
BUG#10696
2005-06-03 10:30:58 +02:00
unknown
638bb0a291 Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.sh
BUILD/SETUP.sh:
  Fix --with-bdb to --with-berkeley-db
2005-06-01 16:16:25 -07:00
unknown
96f629db87 Manual merge.
client/mysqldump.c:
  Auto merged
include/my_global.h:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
client/client_priv.h:
  Manual merge (still to be corrected!)
2005-05-26 12:51:44 +02:00
unknown
5b77d9b8f3 BUG#10796 Incorrect check-cpu result for ppc linux gcc
BUILD/check-cpu:
  Add no_march variable to indicate that this architecture doesn't support the -march flag to GCC
2005-05-25 12:18:18 +10:00
unknown
0295b2eb3c Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/opt/local/work/mysql-5.0-root
2005-05-18 20:11:23 +04:00
unknown
6f59f4a680 Merge mysql.com:/opt/local/work/mysql-5.0-root
into mysql.com:/media/sda1/mysql/mysql-5.0-libtool
2005-05-18 20:01:47 +04:00
unknown
d93806ef7d Fix warnings from icc
Added BUILD scripts for icc
Fixed (one time) memory leak in grant handling


config/ac-macros/misc.m4:
  Remove warnings flags from icc when compiling with -Werror
configure.in:
  Remove warnings flags from icc when compiling with -Werror
extra/replace.c:
  Fix warnings from icc
include/my_dbug.h:
  Fix warnings from icc
sql/gen_lex_hash.cc:
  Fix warnings from icc
sql/mysql_priv.h:
  Add missing variables
sql/mysqld.cc:
  Fix warnings from icc:
  - made a lot of variables static
  - Removing some not used variables
  - Fixed wrong printf()
  - removed extern "C" from some functions
sql/spatial.h:
  Fix warnings from icc
sql/sql_acl.cc:
  Fixed memory leak
sql/sql_lex.cc:
  Fix warnings from icc
sql/sql_lex.h:
  Fix warnings from icc
2005-05-18 19:00:21 +03:00
unknown
a847042f53 new build scripts for SAP team
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-18 15:28:51 +02:00
unknown
9b2e0ed5d2 Remove automatically generated autotools files from revision control.
Fix build scripts to create them.


BitKeeper/deleted/.del-config.guess~fd94a91a69a8ce8:
  Delete: config.guess
BitKeeper/deleted/.del-config.sub~d18f703b655db258:
  Delete: config.sub
BitKeeper/deleted/.del-depcomp~d5c35239e36674f1:
  Delete: depcomp
BitKeeper/deleted/.del-install-sh~ddc86c88a9bebd00:
  Delete: install-sh
BitKeeper/deleted/.del-ltconfig~6d12dc759ce40830:
  Delete: ltconfig
BitKeeper/deleted/.del-ltmain.sh~9b8b907df176f96e:
  Delete: ltmain.sh
BitKeeper/deleted/.del-missing~3fe9ea908d3a7caa:
  Delete: missing
BitKeeper/deleted/.del-mkinstalldirs~fa914ace602e1447:
  Delete: mkinstalldirs
BUILD/FINISH.sh:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-ccc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-cxx:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-alpha-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-hpux11-parisc2-aCC:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-ia64-debug-max:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-irix-mips64-mipspro:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-pentium-pgcc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-debug:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-forte:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc-purify:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BUILD/compile-solaris-sparc:
  Move autotools bootstrap scripts invocation to one place (autorun.sh)
BitKeeper/etc/ignore:
  Added config.guess config.sub install-sh ltmain.sh missing to the ignore list
2005-05-18 15:23:29 +04:00
unknown
7f5bf3dcdb Manual merge (again)
configure.in:
  Auto merged
include/mysql.h:
  Auto merged
innobase/row/row0mysql.c:
  Auto merged
BitKeeper/deleted/.del-ctype-cp932.c:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~4617575065d612b9:
  Auto merged
BitKeeper/deleted/.del-errmsg.txt~ffe4a0c9e3206150:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysqld/Makefile.am:
  Auto merged
mysql-test/r/ctype_ucs.result:
  Auto merged
mysql-test/t/ctype_ucs.test:
  Auto merged
mysql-test/t/ps_grant.test:
  Auto merged
sql/ha_blackhole.cc:
  Auto merged
strings/ctype-big5.c:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged
2005-05-14 12:38:12 +04:00
unknown
4c2265b0ae Fix for Ingo
BUILD/check-cpu:
  Set old_flag to pentium
2005-05-10 17:51:29 +02:00
unknown
b69cd35a6d Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


mysql-test/t/range.test:
  Auto merged
sql/item_strfunc.h:
  Auto merged
2005-05-10 10:49:50 +02:00
unknown
d03e4637b6 Add compiler settings for Pentium M
BUILD/check-cpu:
  Pentium M
2005-05-09 21:59:03 +02:00
unknown
c90b0ab577 Merge
include/my_global.h:
  Auto merged
mysql-test/r/ctype_utf8.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/select.test:
  Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
  Auto merged
ndb/src/mgmapi/mgmapi.cpp:
  Auto merged
ndb/src/ndbapi/NdbIndexOperation.cpp:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/item_sum.h:
  Auto merged
sql/sql_udf.h:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
configure.in:
  Ignore 4.1 version change
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  merge 4.1
ndb/src/ndbapi/ClusterMgr.cpp:
  merge
ndb/test/run-test/Makefile.am:
  merge
sql/mysql_priv.h:
  merge from 4.1
sql/table.cc:
  Merge from 4.1
2005-05-09 11:28:57 -07:00
unknown
b7b8537a59 Fixes after review
BUILD/check-cpu:
  Change variable name
  Add missing fi
  Test with -n instead of -z
2005-05-09 14:49:27 +02:00
unknown
4ab9ce348d Fix check-cpu, add more recognized cpus
BUILD/check-cpu:
  Recognize more cpu's
  Fix for older compilers
2005-05-09 11:26:03 +02:00
unknown
e784912273 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-08 01:57:13 +01:00
unknown
bee950bd83 Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1


BitKeeper/etc/logging_ok:
  auto-union
2005-05-08 01:51:26 +01:00
unknown
fcf18772dd Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1
into ltantony.mysql.com:/usr/home/antony/work2/fixbuild-5.0


BitKeeper/etc/logging_ok:
  auto-union
2005-05-08 01:20:47 +01:00
unknown
9a8e31a426 FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
2005-05-08 01:18:19 +01:00
unknown
474a4d5d8d Merge
BUILD/FINISH.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/r/innodb.result:
  Auto merged
mysql-test/r/type_float.result:
  Auto merged
mysql-test/t/innodb.test:
  Auto merged
sql/ha_heap.cc:
  Auto merged
mysql-test/r/create.result:
  Merge changes
mysql-test/r/temp_table.result:
  SCCS merged
mysql-test/t/temp_table.test:
  Merge new tests
sql/item.cc:
  Merge from 4.1
sql/sql_select.cc:
  Merge from 4.1
2005-05-07 08:25:58 -07:00
unknown
5a50551504 Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/my/mysql-4.1
2005-05-07 12:19:35 +02:00
unknown
78565b0775 Merge mysql.com:/home/jimw/my/mysql-4.1-8648
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-05-07 01:04:54 -07:00
unknown
f5e0fd663d Merge mysql.com:/space/my/mysql-4.1-build
into mysql.com:/space/my/mysql-5.0-build
2005-05-07 01:28:46 +02:00
unknown
cae0d72898 Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged
2005-05-07 01:26:10 +02:00
unknown
8ec23d0efc - typo fix in BUILD/compile-dist
BUILD/compile-dist:
  - typo fix
2005-05-07 01:25:20 +02:00
unknown
03c048b1ea Merge mysql.com:/space/my/mysql-4.0-build
into mysql.com:/space/my/mysql-4.1-build


BUILD/compile-dist:
  Auto merged
2005-05-07 01:18:01 +02:00
unknown
bc6457fc36 - added some required CXXFLAGS to BUILD/compile-dist to allow the distribution build to pass without
unresolved symbols


BUILD/compile-dist:
  - added some required CXXFLAGS to allow the distribution build to pass
2005-05-07 00:53:36 +02:00
unknown
a48bccf44e Fix option handling of ./BUILD/compile-* to not try and pass options to
configure. It was already changed not to support additional options, but now
it was trying to pass all of the options to ./configure. (Bug #8648)


BUILD/FINISH.sh:
  Remove obsolete code that took arguments to the build scripts and passed
  them to configure -- now the only options supported are those handled within
  BUILD/SETUP.sh.
2005-05-05 04:56:30 -07:00
unknown
7f33809731 Manual merge
BitKeeper/etc/logging_ok:
  auto-union
configure.in:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/ps.result:
  Auto merged
mysql-test/t/ndb_restore.test:
  Auto merged
ndb/test/src/NDBT_ResultRow.cpp:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
2005-05-05 13:47:09 +04:00
unknown
203543d1e7 mwcc-wrapper, compile-darwin-mwcc, mwar-wrapper:
Initial Metrowerks CodeWarrior compiler support
  new file


support-files/MacOSX/mwar-wrapper:
  Initial Metrowerks CodeWarrior compiler support
BUILD/compile-darwin-mwcc:
  Initial Metrowerks CodeWarrior compiler support
support-files/MacOSX/mwcc-wrapper:
  Initial Metrowerks CodeWarrior compiler support
2005-05-05 09:34:15 +02:00
unknown
927d747a21 Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0


configure.in:
  Auto merged
2005-04-29 19:31:56 +02:00
unknown
e31358aecb Merge
configure.in:
  SCCS merged
2005-04-29 15:44:24 +02:00
unknown
e28bf9ef5e WL#2286 Compile MySQL w/YASSL support
yaSSL-0.9.7 library bundled.


BUILD/Makefile.am:
  compile-pentium-debug-yassl added to distribution.
Makefile.am:
  Added yassl_dir to SUBDIRS. It contains path to yassl distribution if --with-yassl
  specified. It is empty otherwise.
configure.in:
  yaSSL CHECK-function call.
extra/Makefile.am:
  yaSSL added to distribution.
include/violite.h:
  YASSL_MYSQL_COMPATIBLE macro must be defined to make yassl headers compatible.
2005-04-28 18:23:27 +05:00
unknown
f25f9b5873 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0


configure.in:
  Auto merged
2005-04-28 13:50:32 +02:00
unknown
b411128fa5 After review fixes to check-cpu
BUILD/check-cpu:
  Remove the exit 0 from check-cpu
2005-04-28 13:30:45 +02:00