Commit graph

376 commits

Author SHA1 Message Date
unknown
06707e20bc minor portability fix in SETUP.sh 2006-08-29 01:13:06 +02:00
unknown
4a8c861c05 Fix for check_cpu to work correctly on MacOSX/Intel. 2006-08-10 17:35:21 +03:00
unknown
f3606fa846 Merge perch.ndb.mysql.com:/home/jonas/src/41-work
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-02 09:13:43 +02:00
unknown
753651c1db ndb -
Make possible to build both debug/release from compile-ndb-autotest


BUILD/compile-ndb-autotest:
  Make possible to build both debug/release from compile-ndb-autotest
2006-08-02 09:08:21 +02:00
unknown
cd80d12035 Merge perch.ndb.mysql.com:/home/jonas/src/41-jonas
into  perch.ndb.mysql.com:/home/jonas/src/50-work
2006-08-02 08:28:48 +02:00
unknown
35c871434b Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
into  perch.ndb.mysql.com:/home/jonas/src/41-jonas
2006-06-28 08:35:09 +02:00
unknown
0feec183b2 ndb autotest -
add BUILD/compile-ndb-autotest to simplify building autotest on different mysql versions


BUILD/compile-ndb-autotest:
  New BitKeeper file ``BUILD/compile-ndb-autotest''
2006-06-21 09:20:55 +02:00
unknown
81202460be Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new


ndb/Makefile.am:
  Auto merged
2006-06-17 15:42:24 +02:00
unknown
4d366600b8 Makefile.am:
Avoid error message trying 'windoze-dsp' in obsolete directory
compile-dist:
  Avoid error message for target 'distclean' and no Makefile


BUILD/compile-dist:
  Avoid error message for target 'distclean' and no Makefile
ndb/Makefile.am:
  Avoid error message trying 'windoze-dsp' in obsolete directory
2006-06-17 15:37:23 +02:00
unknown
bd578562f2 Fix BUILD/compile-pentium-gcov
BUILD/compile-pentium-gcov:
  Add -max options for gcov, fix yassl and BDB builds, disable ccache which
  is incompatible with gcc profiling output.
2006-05-22 17:15:49 +02:00
unknown
9cccdf4df4 Use yaSSL as default for BUILD/* scripts 2006-03-21 11:21:52 +01:00
unknown
a3a5df43a5 Makefile.am:
Added 5.0 specific build scripts


BUILD/Makefile.am:
  Added 5.0 specific build scripts
2005-12-18 15:07:58 +01:00
unknown
de1c06b9a2 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0


BUILD/Makefile.am:
  Auto merged
2005-12-18 15:02:13 +01:00
unknown
aa6d8551f8 Merge 2005-12-18 14:55:05 +01:00
unknown
e97a4a4a17 Makefile.am:
Adjusted listing of files to put into source TAR
2005-12-18 14:51:19 +01:00
unknown
50f48187f2 Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like in type_bit.test)":
test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
I wrote to the Valgrind authors in case this is something fixable in Valgrind (normally the
decision to issue a warning is based on the simulated CPU condition code, which should not be undefined here).


BUILD/compile-pentium64-valgrind-max:
  putting this script in sync with compile-pentium-valgrind-max, otherwise we didn't have the federated engine compiled in.
mysql-test/r/read_only.result:
  result update
sql/field.cc:
  To avoid a Valgrind warning running the type_bit test: test "length" first (otherwise when "length" is 0, the *from invalid access still triggers a Valgrind warning).
2005-11-07 16:18:46 +01:00
unknown
8a4c773a7b Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


mysql-test/mysql-test-run.sh:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.result:
  Auto merged
BitKeeper/deleted/.del-ctype_cp932.test:
  Auto merged
Makefile.am:
  Merged from 4.1
2005-11-03 15:01:04 +02:00
unknown
1484d54821 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1


Makefile.am:
  Merged from 4.0
mysql-test/mysql-test-run.sh:
  Merged from 4.0
2005-11-03 13:02:05 +02:00
unknown
9a71442067 Added new build script for pentium64. 2005-11-03 11:19:06 +02:00
unknown
d76d9dcded Use --with-openssl instead of --with-yassl for now
BUILD/SETUP.sh:
  Use --with-openssl instead of --with-yassl for now
  (We need to fix that libmysqlclient_r links with a -PIC compiled yassl library before enabling yassl)
2005-11-02 15:45:25 +02:00
unknown
a9b6631888 Build max builds with --yassl instead of openssl
BUILD/SETUP.sh:
  Build with --yassl instead of openssl
2005-11-02 14:57:18 +02:00
unknown
2dcc6cbea3 Add missing return
Compile max with --yassl instead of --with-openssl


sql/table.cc:
  Add missing return
BUILD/SETUP.sh:
  Compile max with --yassl instead of --with-openssl
2005-11-01 21:57:24 +02:00
unknown
8b1a32aead Merge mysql.com:/home/mysql_src/mysql-4.1
into  mysql.com:/home/mysql_src/mysql-5.0;
a very bad automerge (issues with non-ascii chars), plus some hard conflicts I'll fix by hand in a next cset


BitKeeper/deleted/.del-compile-pentium64-valgrind-max:
  Delete: BUILD/compile-pentium64-valgrind-max
BitKeeper/etc/config:
  Auto merged
sql/log.cc:
  Auto merged
sql/slave.h:
  Auto merged
client/mysqltest.c:
  manual merge
mysql-test/r/subselect.result:
  manual merge
mysql-test/t/subselect.test:
  manual merge
sql/log_event.cc:
  manual merge
sql/log_event.h:
  manual merge
sql/slave.cc:
  manual merge
sql/sql_yacc.yy:
  manual merge
2005-10-12 21:58:02 +02:00
unknown
61dfc3347f merge 2005-10-12 13:31:48 +02:00
unknown
c2621f3dcb Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into  mysql.com:/home/my/mysql-5.0


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_sys.h:
  Auto merged
mysql-test/r/func_str.result:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/r/information_schema_inno.result:
  Auto merged
mysql-test/r/multi_statement.result:
  Auto merged
mysql-test/r/mysqldump.result:
  Auto merged
mysql-test/r/temp_table.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/information_schema_inno.test:
  Auto merged
mysql-test/t/multi_statement.test:
  Auto merged
mysql-test/t/mysql.test:
  Auto merged
mysql-test/t/temp_table.test:
  Auto merged
sql/ha_federated.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/structs.h:
  Auto merged
sql/table.h:
  Auto merged
strings/decimal.c:
  Auto merged
sql/sql_parse.cc:
  manual merge
sql/sql_prepare.cc:
  manual merge
sql/table.cc:
  manual merge
2005-10-08 03:37:23 +03:00
unknown
c807724f36 Review of code pushed since last 5.0 pull:
Ensure that ccache is also used for C programs
mysql: Ensure that 'delimiter' works the same way in batch mode as in normal mode
mysqldump: Change to use ;; (instead of //) as a stored procedure/trigger delimiter
Fixed test cases by adding missing DROP's and rename views to be of type 'v#'
Removed MY_UNIX_PATH from fn_format()
Removed current_db_used from TABLE_LIST
Removed usage of 'current_thd' in Item_splocal
Removed some compiler warnings
A bit faster longlong2str code



BUILD/FINISH.sh:
  Ensure that ccache is also used for C programs
BUILD/SETUP.sh:
  Ensure that ccache is also used for C programs
client/mysql.cc:
  More debugging
  Ensure that 'delimiter' works the same way in batch mode as in normal mode.
  Compare 'delimiter' command case-insensitive.
  The above fixes the delimiter bugs so that we can now use ;; as a trigger/SP function delimiter in mysqldump.
client/mysqldump.c:
  Indentation fixes
  Use ;; as a delmimiter for stored procedures and triggers instead of //
client/mysqltest.c:
  Indentation fixes
include/my_sys.h:
  Remove not needed MY_UNIX_PATH parameter
mysql-test/r/alter_table.result:
  Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
mysql-test/r/func_str.result:
  More testing of CONV() (to ensure that longlong2str() works correctly)
mysql-test/r/information_schema.result:
  Drop all used tables and views
  Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
mysql-test/r/information_schema_inno.result:
  Drop all used tables
mysql-test/r/multi_statement.result:
  Drop used tables
mysql-test/r/mysql.result:
  Add error messages to result
mysql-test/r/mysqldump.result:
  ;; is now used as SP/trigger delimiter
mysql-test/r/mysqlshow.result:
  Drop used tables
mysql-test/r/temp_table.result:
  Drop used views
  Rename views to v#
mysql-test/t/alter_table.test:
  Better to reuse mysqltest database (test didn't properly delete mysqltest1 at start)
mysql-test/t/func_str.test:
  More testing of CONV() (to ensure that longlong2str() works correctly)
mysql-test/t/information_schema.test:
  Drop all used tables and views
  Rename view tables to 'v#' to ensure that if this test fails, not a lot of other test fails
mysql-test/t/information_schema_inno.test:
  Drop all used tables
mysql-test/t/multi_statement.test:
  Drop used tables
mysql-test/t/mysql.test:
  Add error messages to result
mysql-test/t/mysqlshow.test:
  Drop used tables
mysql-test/t/temp_table.test:
  Drop used views
  Rename views to v#
mysys/mf_format.c:
  Remove not needed MY_UNIX_PATH parameter
  (This goes against how fn_format() is supposed to work and also conflicts with other options like MY_RETURN_REAL_PATH)
sql/ha_federated.cc:
  Removed extra empty line
sql/item.cc:
  Use 'str_value' instead of 'str_value_ptr' to hold result for Item_splocal
  Remove some calls to 'thd' in Item_splocal by making 'thd' a class variable
  One doesn't have to set 'null_value' when calling 'is_null()'
sql/item.h:
  Add THD as a class variable to Item_splocal
  Use 'str_value' instead of 'str_value_ptr' to hold temp result
  Fixed bug in Item_hex when used in CAST()
sql/item_func.cc:
  Optimize new code
sql/log_event.cc:
  Move 'to_unix_path()' out of fn_format()
sql/opt_range.cc:
  Simplify code
sql/sp_head.cc:
  Ensure that Item_splocal has thd set before we call '->this_item()'
sql/sql_class.cc:
  Return error if Statement::insert() fails in either hash_insert()
sql/sql_parse.cc:
  Remove 'current_db_used' as we can trivially check if db table qualifier was used without this.
  Simplify code
sql/sql_prepare.cc:
  Use enum instead of const int, to avoid ugly code for VC++
sql/structs.h:
  Remove compiler warnings when using STRING_WITH_LEN() with constant strings.
sql/table.cc:
  Fixed indentation
sql/table.h:
  Remove not needed current_db_used
strings/decimal.c:
  Simplify code
strings/longlong2str-x86.s:
  A bit faster longlong2str.
  (Took some ideas from Peter Gulutzan's code)
strings/my_strtoll10.c:
  Simplify code for MetroWerks compiler
2005-10-06 17:54:43 +03:00
unknown
3410309f26 Revert
BUILD/SETUP.sh:
  Remove -ansi
2005-10-05 14:37:42 +02:00
unknown
e484fdf5bf Revert
BUILD/SETUP.sh:
  Remov -ansi flag
2005-10-05 14:35:41 +02:00
unknown
91f2db942f Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and speeding up 'bk citool' for me
BitKeeper/etc/config:
  speed up 'bk citool' for me
BUILD/compile-pentium64-valgrind-max:
  New BitKeeper file ``BUILD/compile-pentium64-valgrind-max''
2005-10-04 22:24:04 +02:00
unknown
ee6e983c5c Move -ansi from global_warnings to cxx_warnings 2005-10-04 14:42:02 +02:00
unknown
19dffd265e Move -ansi flag from global_warnings to cxx_warnings
BUILD/SETUP.sh:
  ansi glags should only be set for C++ compilation
2005-10-03 16:24:47 +02:00
unknown
f3c622356f Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-release


BUILD/SETUP.sh:
  Auto merged
client/mysql.cc:
  Auto merged
mysql-test/lib/mtr_report.pl:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
scripts/make_win_src_distribution.sh:
  Auto merged
sql/des_key_file.cc:
  Auto merged
2005-09-30 16:37:02 +02:00
unknown
2f9e42f7eb New flags for new max-no-ndb build script to get a build that has
everything except NDB


BUILD/SETUP.sh:
  Added base_max_no_ndb_configs so I can get a max-type build sans NDB for faster builds.
BUILD/compile-pentium-debug-max-no-ndb:
  new script to compile a max-type build sans NDB
BUILD/compile-ppc-debug-max-no-ndb:
  new script to build a max-type build sans NDB
2005-09-29 13:45:39 -07:00
unknown
9a8482f69b Add -ansi flag when building with gcc
BUILD/SETUP.sh:
  Add -ansi flag, make gcc not allow "C++ comments in C"
2005-09-29 10:30:20 +02:00
unknown
ea599a0032 BUG #13511 Wrong patch pushed, fixing.
BUILD/SETUP.sh:
  BUG #13511, wrong patch pushed, fixing.
2005-09-28 08:04:08 -07:00
unknown
7a19e76c54 BUG #13511
Fixed SETUP.sh to not overwrite prefix_configs, making 'make install' 
install in "/"


BUILD/SETUP.sh:
  BUG #13511
  
  test -n is for testing if a FILE is zero length! Plus, if the value is zero,
  we don't want to set it to that value, we want to leave it as it was 
  already set. We _want_ to set it _if_ it is _not_ zero. Changed to "! -z",
  which is for testing strings.
2005-09-26 18:51:27 -07:00
unknown
f679e33cf9 Fixed a typo in handler.cc if CSV was built. I also added CSV to the default MAX builds so that more people test it.
BUILD/SETUP.sh:
  Adding CVS engine to default max builds.
sql/handler.cc:
  Fixed typo
2005-09-20 15:26:10 -07:00
unknown
0031af0685 Brian's "he is too lazy to commit this so Eric is going to have to do it" environmental variable hack for prefix. This allows you to just set a prefix in your profile which will be used in all of your builds. AKA you can be even lazier(!) about calling BUILD scripts. Don't blame Eric, Brian borrowed his keyboard.
BUILD/SETUP.sh:
  Added option to set environmental variable in case you are lazy about setting prefix (ala Brian)
BUILD/autorun.sh:
  Change of syntax
2005-09-16 18:10:36 -07:00
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
unknown
c18bed5715 Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-04-27 17:52:47 +02:00
unknown
cd50bf9ae4 After review fix
BUILD/check-cpu:
  Remove defaul flag i386 and add a check to see wheter to set check_cpu_cflags or not.
2005-04-27 17:52:14 +02:00
unknown
0e29519b2b Merge from 4.1 to 5.0
client/mysql.cc:
  Auto merged
include/my_pthread.h:
  Auto merged
ndb/src/ndbapi/ndberror.c:
  Auto merged
sql/examples/ha_archive.cc:
  Auto merged
sql/examples/ha_archive.h:
  Auto merged
BUILD/SETUP.sh:
  Manual merge of conflicts
  -DBIG_TABLES removed set by configure using --with-big-tables
configure.in:
  manual merge
mysql-test/r/archive.result:
  Manual merge
mysql-test/t/archive.test:
  Manual merge
2005-04-27 12:56:01 +02:00
unknown
78f89a729a Bug#9263 GCC4: -mcpu is depricated, use -mtune or -march instead
- Made a script that selects the best compiler optimizations for the current cpu.
   - Use the script from BUILD/SETUP.sh 


BUILD/SETUP.sh:
  Run check-cpu and use the compiler optimization flags it outputs
2005-04-27 12:50:37 +02:00
unknown
66403f827a Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0 2005-04-19 13:53:34 +02:00
unknown
4eb5f10631 Proper handling of "utf8-general-cs" clollation: Missing parts in configuration.
configure.in:
  No change here - functionality was moved to 'config/ac-macros/character_sets.m4'
mysys/charset-def.c:
  Auto-merged.
strings/ctype-utf8.c:
  Auto-merged.
2005-04-11 11:12:08 +02:00
unknown
b9f486cd02 Add missing parts for the "Cybozu" custom build, to avoid future manual patches.
configure.in:
  Normally, 'configure' does only support "case-insensitive" collations for UTF-8 character sets.
  However, a certain customer requires builds with a "case-sensitive" collation: 'utf8_general_cs'.
  In order to do custom builds without manual patches, this value gets special handling in 'configure'.
  Also, when it is given, the CPP symbol enabling the additional code is set.
mysys/charset-def.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
strings/ctype-utf8.c:
  Rename the CPP symbol needed for "UTF8-case-sensitive" collation from customer name to function.
2005-04-08 13:56:48 +02:00
unknown
fe5d32b699 As of 5.0.4, all builds will use '--with-big-tables'. Let development builds follow. 2005-03-30 17:45:03 +02:00
unknown
e904d0e750 Porting of "buffered read" patch to 5.0 and post-review fixes.
The patch implements the idea suggested by Olaf van der Spek in 
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving 
one-column tables.


BUILD/SETUP.sh:
  Remove --with-vio option which no longer exist.
BUILD/compile-pentium64-valgrind-max:
  Remove --with-vio option which no longer exist.
config/ac-macros/misc.m4:
  Removed --with-vio configure switch: we always use VIO. The switch,
   in fact, only saved us one pointer dereferencing per call in case we had
  only one transport type in VIO enabled.
config/ac-macros/openssl.m4:
  Removed HAVE_VIO.
include/config-win.h:
  Removed HAVE_VIO (not needed anymore)
  Added HAVE_VIO_READ_BUFF (define buffered client reads for Windows clients).
include/violite.h:
  Removed HAVE_VIO, as currently VIO is always in use.
  Added declaration for vio_read_buff and related members in struct VIO.
sql-common/client.c:
  Use flags to set up vio read buffering in mysql_real_connect.
sql/mysqld.cc:
  Use flags to disable vio read buffering when creating a server 
  connection.
vio/vio.c:
  Optionally set up vio read buffer when creating a new VIO structure.
vio/viosocket.c:
  Implementation of client-side buffered reads in VIO: the idea 
  is to buffer small reads in a client buffer to save amount of
  syscalls per retrieved result set. The implementation relies
  on the fact that read/recv will return as soon as there is
  some data in the kernel buffer, no matter how big the given
  user's buffer is. To be able to disable it in case recv/read don't
  have such semantics, the new calls are guarded
  with #define HAVE_VIO_READ_BUFF. Currently buffered reading is 
  switched on only for BSD sockets and named pipes, both on Windows
  and UNIXes.
2005-03-06 00:10:08 +03:00
unknown
08c2f9e791 Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
Recommited, as I made a typo in the previous patch myself =)


BUILD/SETUP.sh:
  Fix a typo caused bdb to be skipped when building with BUILD/compile-*-max
2005-02-17 04:18:49 +03:00
unknown
8602ef9328 Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perl
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile


BUILD/compile-solaris-sparc-purify:
  Auto merged
2005-02-07 13:27:44 +01:00
unknown
f3f2ec2f91 compile-solaris-sparc-purify:
Set CCLD as well


BUILD/compile-solaris-sparc-purify:
  Set CCLD as well
2005-02-07 13:25:03 +01:00