summaryrefslogtreecommitdiff
path: root/BUILD
Commit message (Collapse)AuthorAgeFilesLines
* Fix for BUG#14703 "Valgrind error when inserting 0 into a BIT column (like ↵unknown2005-11-071-2/+2
| | | | | | | | | | | | | | | | 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).
* Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-11-031-0/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0unknown2005-11-031-0/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Added new build script for pentium64.unknown2005-11-031-0/+13
| | |
* | | Use --with-openssl instead of --with-yassl for nowunknown2005-11-021-3/+7
| | | | | | | | | | | | | | | | | | 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)
* | | Build max builds with --yassl instead of opensslunknown2005-11-021-2/+2
| | | | | | | | | | | | | | | BUILD/SETUP.sh: Build with --yassl instead of openssl
* | | Add missing returnunknown2005-11-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge mysql.com:/home/mysql_src/mysql-4.1unknown2005-10-121-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | mergeunknown2005-10-121-1/+1
| |\ \
| | * | Revert unknown2005-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: Remov -ansi flag
| * | | Importing BUILD/compile-pentium64-valgrind-max from 5.0 (unchanged), and ↵unknown2005-10-041-0/+29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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''
| * | Move -ansi flag from global_warnings to cxx_warningsunknown2005-10-031-2/+2
| | | | | | | | | | | | | | | BUILD/SETUP.sh: ansi glags should only be set for C++ compilation
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-082-1/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Review of code pushed since last 5.0 pull:unknown2005-10-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Revertunknown2005-10-051-1/+1
| | | | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: Remove -ansi
* | | | Move -ansi from global_warnings to cxx_warningsunknown2005-10-041-2/+2
| | | |
* | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-09-301-1/+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
| * | | Add -ansi flag when building with gccunknown2005-09-291-1/+1
| | | | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: Add -ansi flag, make gcc not allow "C++ comments in C"
* | | | New flags for new max-no-ndb build script to get a build that has unknown2005-09-293-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | BUG #13511 Wrong patch pushed, fixing.unknown2005-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: BUG #13511, wrong patch pushed, fixing.
* | | | BUG #13511unknown2005-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Fixed a typo in handler.cc if CSV was built. I also added CSV to the ↵unknown2005-09-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default MAX builds so that more people test it. BUILD/SETUP.sh: Adding CVS engine to default max builds. sql/handler.cc: Fixed typo
* | | | Brian's "he is too lazy to commit this so Eric is going to have to do it" ↵unknown2005-09-162-1/+6
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2005-09-012-20/+31
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
| * | | Bug #12717 yassl: Crashes in "integer.cpp" when compiled with iccunknown2005-09-012-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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''
* | | | added file missing from release to EXTRA_DIST list (bug# 12733)unknown2005-08-221-0/+1
| | | |
* | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-08-161-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-5.0
| * | | Adding support for opteron optimization in build files. unknown2005-07-201-0/+6
| | | |
* | | | Fix BUILD/autorun.sh to really bail out on error.unknown2005-07-181-9/+9
| | | | | | | | | | | | | | | | | | | | BUILD/autorun.sh: Make exit on error actually work.
* | | | Added federated to max base test. unknown2005-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: Added federated to base_max tests.
* | | | Removed dead options, fixed pentium script to no longer ask for isam (its ↵unknown2005-07-152-5/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Added a test for glibtoolize so that the autoconf tools that come installed ↵unknown2005-07-111-2/+8
| | | | | | | | | | | | | | | | | | | | | 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
* | | mergeunknown2005-06-071-5/+8
|\ \ \ | |/ /
| * | Fix BUILD/check-cpu for powerpcunknown2005-06-061-5/+8
| | | | | | | | | | | | | | | BUILD/check-cpu: fix for powerpc linux
* | | Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1unknown2005-06-031-42/+126
|\ \ \ | |/ / | | | | | | | | | | | | | | | into mysql.com:/home/hartmut/projects/mysql/dev/5.0
| * | check-cpu fixes/improvements (Bug #11065)unknown2005-06-031-42/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge mysql.com:/home/hartmut/projects/mysql/dev/4.1unknown2005-06-031-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | into mysql.com:/home/hartmut/projects/mysql/dev/5.0 BUILD/Makefile.am: Auto merged
| * | bundle the check-cpu helper script with source packages.unknown2005-06-031-0/+1
| | | | | | | | | | | | | | | | | | | | | BUG#10696
| * | Fix --with-bdb to be --with-berkeley-db in BUILD/SETUP.shunknown2005-06-011-2/+2
| | | | | | | | | | | | | | | BUILD/SETUP.sh: Fix --with-bdb to --with-berkeley-db
* | | Manual merge.unknown2005-05-261-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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!)
| * | BUG#10796 Incorrect check-cpu result for ppc linux gccunknown2005-05-251-0/+4
| | | | | | | | | | | | | | | BUILD/check-cpu: Add no_march variable to indicate that this architecture doesn't support the -march flag to GCC
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-05-1813-67/+46
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * \ \ Merge mysql.com:/opt/local/work/mysql-5.0-rootunknown2005-05-1813-67/+46
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/media/sda1/mysql/mysql-5.0-libtool
| | * | | Remove automatically generated autotools files from revision control. unknown2005-05-1813-67/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Fix warnings from iccunknown2005-05-182-0/+71
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | new build scripts for SAP teamunknown2005-05-182-0/+18
|/ / / | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Manual merge (again)unknown2005-05-141-0/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix for Ingounknown2005-05-101-0/+1
| | | | | | | | | | | | | | | BUILD/check-cpu: Set old_flag to pentium
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-05-101-0/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 mysql-test/t/range.test: Auto merged sql/item_strfunc.h: Auto merged
| * | Add compiler settings for Pentium Munknown2005-05-091-0/+3
| | | | | | | | | | | | | | | BUILD/check-cpu: Pentium M
View Lorry Controller Status