summaryrefslogtreecommitdiff
path: root/BUILD
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/M50/mysql-5.0 into mysql.com:/M50/push-5.0unknown2005-04-191-5/+5
|\
| * As of 5.0.4, all builds will use '--with-big-tables'. Let development builds ↵unknown2005-03-301-5/+5
| | | | | | | | follow.
* | Proper handling of "utf8-general-cs" clollation: Missing parts in configuration.unknown2005-04-111-0/+9
|\ \ | |/ |/| | | | | | | | | | | | | 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.
| * Add missing parts for the "Cybozu" custom build, to avoid future manual patches.unknown2005-04-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Porting of "buffered read" patch to 5.0 and post-review fixes.unknown2005-03-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Fix a typo caused bdb to be skipped when building with BUILD/compile-*-maxunknown2005-02-171-2/+2
| | | | | | | | | | | | | | | | 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
* | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-perlunknown2005-02-071-4/+4
|\ \ | |/ | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-compile BUILD/compile-solaris-sparc-purify: Auto merged
| * compile-solaris-sparc-purify:unknown2005-02-071-4/+4
| | | | | | | | | | | | | | | | Set CCLD as well BUILD/compile-solaris-sparc-purify: Set CCLD as well
* | Fixed bug detected by sp-testsunknown2005-02-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup during reviews of new pushed code BUILD/compile-pentium-debug-max: Use --debug=full as default BUILD/compile-pentium-debug: Use --debug=full as default mysys/my_alloc.c: More debugging sql/item_func.cc: Cleanup new code Don't call insert_id() for last_insert_id(value) to avoid side effects sql/item_subselect.cc: Fixed DBUG output sql/sp_head.cc: Simple cleanup sql/sql_lex.cc: Moved usage of arguments first in lex_start to make their usage clearer Remove sl->expr_list.deleete_elements() becasue: - It didn't do anything (delete_elements on a list of list is a no-op operation) - The deleted for loop used SELECT_LEX elements that was allocated in mysql_new_select() in sp-head, but freed when sphead->mem_root was freed. (delete sphead doesn't remove used SELECT_LEX elements from the global all_selects_list) sql/sql_parse.cc: More DBUG entries
* | After merge fixesunknown2005-02-021-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged scripts/mysql_install_db.sh: Auto merged sql/ha_innodb.cc: Auto merged
| * Removed duplicate close call and added archive to the debug build and test. unknown2005-01-311-1/+1
| | | | | | | | | | | | | | BUILD/compile-ia64-debug-max: Added archive for this build. sql/examples/ha_archive.cc: Removed duplicate close call.
* | Mergeunknown2005-01-311-11/+92
|\ \ | |/
| * compile-solaris-sparc-purify:unknown2005-01-281-10/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded) Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options mysql-test-run.sh: Report correctly combinations of embedded+ps-protocol etc Added initial Purify support mysql-test/mysql-test-run.sh: Report correctly combinations of embedded+ps-protocol etc Added initial Purify support BUILD/compile-solaris-sparc-purify: Added preparation of mysql_client_test(_embedded) and mysqltest(_embedded) Added --purify, --purecov, --quantify and --cxxfilt <cxxfiltprog> options
* | Merge mysql.com:/home/mydev/mysql-4.1-4100unknown2005-01-271-4/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/mydev/mysql-5.0-5000 BUILD/SETUP.sh: Auto merged include/my_global.h: Auto merged mysql-test/r/lowercase_table2.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/t/order_by.test: Auto merged sql/item_timefunc.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged
| * Re-enabled the use of --prefix.unknown2005-01-271-4/+6
| | | | | | | | | | | | | | | | Adjusted the "Usage:" string. Ordered the option recognition in reverse order from "Usage:".
* | Merge from 4.1unknown2005-01-262-3/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Archive fix by Ingo. Innodb compile fix by Monty. configure.in: Auto merged innobase/include/univ.i: Auto merged BUILD/SETUP.sh: Auto merged mysql-test/t/archive.test: Auto merged sql/examples/ha_archive.cc: Auto merged sql/examples/ha_archive.h: Auto merged sql/handler.cc: Auto merged sql/sql_select.cc: Auto merged innobase/fil/fil0fil.c: Merged Montys fix.
| * Only enable Innodb extra debugging when using the --debug=full configure optionunknown2005-01-262-3/+7
| | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: Abort if wrong options BUILD/compile-pentium64-debug: Always use full debugging innobase/fil/fil0fil.c: Fixed wrong printf() format
* | mergedunknown2005-01-251-0/+13
|\ \ | |/ | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BUILD/SETUP.sh: Auto merged sql/mysqld.cc: Auto merged sql/sql_select.cc: Auto merged
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-252-0/+16
| |\ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/my/mysql-4.1 BUILD/SETUP.sh: Auto merged
| | * Add flags for Intel 64 bitunknown2005-01-252-0/+16
| | |
* | | Build federated storage engine as part of max builds.unknown2005-01-191-1/+1
| | | | | | | | | | | | | | | BUILD/SETUP.sh: Add --with-federated-storage-engine to max_configs
* | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-01-199-46/+24
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean BitKeeper/deleted/.del-compile-amd64-debug-max: Delete: BUILD/compile-amd64-debug-max BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-compile-amd64-max: Delete: BUILD/compile-amd64-max
| * | Fix all BUILD/*max* scripts to use -DBIG_TABLES, like our real Max builds do.unknown2005-01-198-32/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (Simpler fix than last commit -- no need to mess with base_cxxflags.) BUILD/compile-amd64-max: use $max_cflags BUILD/compile-pentium-debug-max: use $max_cflags BUILD/compile-pentium-debug-max-no-embedded: use $max_cflags BUILD/compile-pentium-max: use $max_cflags BUILD/compile-pentium-valgrind-max: use $max_cflags BUILD/compile-ppc-debug-max: use $max_cflags BUILD/compile-ppc-max: use $max_cflags BUILD/compile-amd64-debug-max: use $max_cflags, remove unnecessary base_cxxflags stuff
| * | Put flags for -max building in BUILD/SETUP.sh so they are consistent acrossunknown2005-01-139-10/+38
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all architectures, and in sync with the flags used to build the MySQL Max packages. Also back-port AMD64 build scripts from 5.0. BUILD/SETUP.sh: Add $max_configs (and variants) and amd64_* BUILD/compile-pentium-debug-max: Use $max_configs BUILD/compile-pentium-debug-max-no-embedded: Use $max_no_es_configs BUILD/compile-pentium-max: Use $max_configs BUILD/compile-pentium-valgrind-max: Use $max_leave_isam_configs BUILD/compile-ppc-debug-max: Use $max_configs BUILD/compile-ppc-max: Use $max_configs
* | Changed interface for my_strntod() to make it more general and more portableunknown2005-01-151-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD/compile-solaris-sparc-purify: Cleanup (Changes from Kent) include/m_string.h: New interface for my_strtod() mysql-test/mysql-test-run.sh: Added option --use-old-data to allow one to run a test case on an existing table (Good for debugging) mysql-test/r/strict.result: Updated results mysql-test/r/type_float.result: More tests mysql-test/t/strict.test: Safety fix mysql-test/t/type_float.test: More tests mysys/mf_iocache.c: Change flush_io_cache() to my_b_flush_io_cache() More debugging mysys/thr_lock.c: Added comment sql/field.cc: Use new my_strntod() sql/filesort.cc: Indentation fixes sql/item.cc: Use new my_strntod() sql/item_strfunc.cc: Use new my_strntod() sql/item_sum.cc: Use new my_strntod() strings/ctype-cp932.c: strnncollsp was missing one argument strings/ctype-simple.c: Use new my_strntod() strings/ctype-ucs2.c: Use new my_strntod() strings/strtod.c: Changed interface: - Force user to supply pointer to end of string (eliminates the need for an end \0) - More strict error checking (depend less off if INF is set), which makes this more portable - Better handling of numbers of type 0.000000....E+... - Return pointer to + in case of '+.' The above should fix a that strict.test failed on Solaris-sparc.
* | mergeunknown2005-01-071-0/+1
|\ \ | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union ndb/src/mgmsrv/main.cpp: Auto merged
| * \ mergedunknown2005-01-061-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union include/my_pthread.h: Auto merged innobase/os/os0file.c: Auto merged scripts/mysqld_safe.sh: Auto merged sql/set_var.cc: Auto merged sql/sql_parse.cc: Auto merged sql-common/client.c: merged manually
| | * - Manually merged two changes from 4.0unknown2005-01-061-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | BUILD/compile-dist: - manual merge include/my_pthread.h: - manual merge
| | | * - enable "with-extra-charsets=complex" for the "compile-dist" distributionunknown2005-01-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | build (to make the test suite pass) BUILD/compile-dist: - enable "with-extra-charsets=complex" for the distribution build (to make the test suite pass)
* | | | Mergeunknown2005-01-041-0/+47
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged ndb/include/Makefile.am: Auto merged ndb/include/ndb_global.h.in: Auto merged sql/ha_ndbcluster.h: Auto merged sql/ha_ndbcluster.cc: SCCS merged
| * | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYunknown2005-01-031-0/+47
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union Makefile.am: Auto merged client/mysqltest.c: Auto merged configure.in: Auto merged innobase/log/log0recv.c: Auto merged myisam/mi_check.c: Auto merged mysql-test/r/cast.result: Auto merged mysql-test/r/drop.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/drop.test: Auto merged mysql-test/t/func_time.test: Auto merged ndb/include/ndb_global.h.in: Auto merged ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged sql/ha_ndbcluster.h: Auto merged sql/item_timefunc.h: Auto merged sql/log_event.cc: Auto merged sql/log_event.h: Auto merged sql/set_var.cc: Auto merged sql/sql_repl.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_select.cc: Auto merged sql-common/my_time.c: Auto merged sql/sql_union.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/time.cc: Auto merged innobase/row/row0upd.c: Trivial merge mysql-test/t/func_concat.test: Keep local code mysql-test/t/multi_update.test: auto merge sql/ha_ndbcluster.cc: manual merge sql/item_timefunc.cc: manual merge sql/mysql_priv.h: manual merge sql/sql_class.h: manual merge sql/sql_delete.cc: manual merge sql/sql_insert.cc: manual merge sql/sql_lex.cc: manual merge sql/sql_lex.h: manual merge sql/sql_load.cc: manual merge sql/sql_parse.cc: manual merge sql/sql_table.cc: manual merge sql/sql_update.cc: manual merge
| | * | - updated compile-dist to include NDB clusterunknown2004-12-311-1/+2
| | | | | | | | | | | | | | | | | | | | BUILD/compile-dist: - make sure to include NDB cluster in the distribution, too
| | * | Merge mysql.com:/space/my/mysql-4.0unknown2004-12-311-0/+46
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/my/mysql-4.1-build Build-tools/Bootstrap: Auto merged
| | | * - Bootrap now uses "compile-dist" by default to create the source distributionunknown2004-12-311-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | Build-tools/Bootstrap: - Use BUILD/compile-dist instead of compile-pentium-max - some minor cleanups
* | | | Merge mysql.com:/home/jonas/src/mysql-5.0unknown2004-12-202-0/+30
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0-ndb
| * | | Add 0x before pointers (to help with debugging)unknown2004-12-182-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for VARCHAR with 1 or 2 length bytes Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly) Give error if we got problems in temporary tables during a SELECT Don't use new table generated by ALTER TABLE if index generation fails Fixed wrong call by range_end() (Could cause an ASSERT in debug mode) BUILD/SETUP.sh: Add flags for Intel 64 dbug/dbug.c: Add 0x before pointers (to help with debugging) heap/_check.c: Add 0x before pointers (to help with debugging) heap/hp_create.c: Add support for VARCHAR with 1 or 2 length bytes heap/hp_delete.c: Add 0x before pointers heap/hp_hash.c: Add support for VARCHAR with 1 or 2 length bytes Added more debugging heap/hp_open.c: Add 0x before pointers heap/hp_rkey.c: Add 0x before pointers heap/hp_rrnd.c: Add 0x before pointers heap/hp_write.c: Add 0x before pointers include/my_base.h: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_static.c: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_test1.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation (This file should probably be deleted as it doesn't compile) myisam/ft_update.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation Removed some not needed 'else' myisam/mi_check.c: Don't give an error for tables packed with myisampack myisam/mi_checksum.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_create.c: Add support for VARCHAR with 1 or 2 length bytes Store in number of pack-length-bytes in keyseg->bit_start myisam/mi_dbug.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_dynrec.c: Add support for VARCHAR with 1 or 2 length bytes (old code in _mi_rec_unpack() didn't really work with VARCHAR's) myisam/mi_key.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_open.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_packrec.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_search.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test1.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test3.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test_all.res: Update results myisam/mi_unique.c: Add support for VARCHAR with 1 or 2 length bytes myisam/myisampack.c: Add support for VARCHAR with 1 or 2 length bytes mysql-test/include/varchar.inc: Added more tests mysql-test/r/bdb.result: Update results after new tests mysql-test/r/information_schema.result: Update results mysql-test/r/innodb.result: Update results mysql-test/r/myisam.result: Update results after new tests mysql-test/r/ps_1general.result: Update results mysql-test/t/bdb.test: Shorter comments mysys/list.c: Add 0x before pointers mysys/my_handler.c: Add support for VARCHAR with 1 or 2 length bytes mysys/raid.cc: Add 0x before pointers sql/field.cc: Add support for VARCHAR with 1 or 2 length bytes sql/field.h: Add support for VARCHAR with 1 or 2 length bytes sql/field_conv.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_berkeley.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_heap.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_myisam.cc: Ensure that enable_indexes() will report an error if it fails Enable VARCHAR packing for MyISAM files sql/item_sum.cc: Change key_cmp -> cmp() as we are comparing fields, not key segements sql/opt_range.cc: Add support for VARCHAR with 1 or 2 length bytes Change range_end to call ha_index_or_rnd_end() as in some error cases we may be in rnd mode when we abort sql/sql_base.cc: Remove compiler warning sql/sql_parse.cc: Move length checking code to sql_table.cc (as we don't have character set for fields at this stage) sql/sql_select.cc: Add support for VARCHAR with 1 or 2 length bytes Ensure that we report an error if we get an error while writing to internal temporary tables sql/sql_select.h: Add support for VARCHAR with 1 or 2 length bytes sql/sql_show.cc: Fix typo in comment sql/sql_table.cc: Don't use new table generated by ALTER TABLE if index generation fails vio/vio.c: Fixed DBUG info vio/viosocket.c: Fixed DBUG info vio/viossl.c: Fixed DBUG info vio/viosslfactories.c: Fixed DBUG info
* | | | chmod a+xunknown2004-12-201-0/+17
| | | |
* | | | .del-compile-amd64-max~55ce22d5200bf8da:unknown2004-12-201-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete: BUILD/compile-amd64-max BitKeeper/deleted/.del-compile-amd64-max~55ce22d5200bf8da: Delete: BUILD/compile-amd64-max
* | | | chmod a+xunknown2004-12-201-0/+17
| | | |
* | | | .del-compile-amd64-max~f3b2b8c5aefbeacb:unknown2004-12-201-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delete: BUILD/compile-amd64-max BitKeeper/deleted/.del-compile-amd64-max~f3b2b8c5aefbeacb: Delete: BUILD/compile-amd64-max
* | | | logging_ok:unknown2004-12-202-0/+32
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted compile-amd64-max, compile-amd64-debug-max: new file BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Merge with 4.1unknown2004-12-065-0/+50
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union BUILD/SETUP.sh: Auto merged Build-tools/Do-compile: Auto merged client/mysqladmin.cc: Auto merged configure.in: Auto merged innobase/include/lock0lock.h: Auto merged innobase/os/os0file.c: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/insert_select.result: Auto merged mysql-test/r/lowercase_table3.result: Auto merged mysql-test/r/rpl_start_stop_slave.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/rpl_until.test: Auto merged mysql-test/t/subselect.test: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged sql/field.cc: Auto merged sql/field.h: Auto merged sql/ha_myisam.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.cc: Auto merged sql/item_func.cc: Auto merged sql/lock.cc: Auto merged sql/log_event.h: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/slave.cc: Auto merged sql/slave.h: Auto merged sql/sql_acl.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_class.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_prepare.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_show.cc: Auto merged sql/sql_update.cc: Auto merged sql/sql_yacc.yy: Auto merged sql/log_event.cc: Merge with 4.1 Trivial cleanup
| * | - fixed file permissions (need execute bits set)unknown2004-12-024-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD/compile-ppc-debug-max: Change mode to -rwxrwxr-x BUILD/compile-ppc-debug: Change mode to -rwxrwxr-x BUILD/compile-ppc-max: Change mode to -rwxrwxr-x BUILD/compile-ppc: Change mode to -rwxrwxr-x
| * | - added some BUILD/compile-ppc* build scripts to ease building on LinuxPPCunknown2004-12-025-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | - added ppc_cflags to BUILD/SETUP.sh BUILD/SETUP.sh: - added ppc_cflags for compiling on Linux/PPC
* | | use distclean in BUILD/compile* scripts to make sure .deps dirs gounknown2004-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | away (old .Plo files in them showed to cause build problems for at least another dev and me, and they also cause problems after .c->.cc renames). BUILD/FINISH.sh: use distclean in BUILD/compile* scripts to make sure .deps dirs go away (old .Plo files in them showed to +cause build problems for at least another dev and me).
* | | Fixes after merge with 4.1unknown2004-11-031-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FOUND is not a reserved keyword anymore Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT Note that the 5.0 tree is not yet up to date: Sanja will have to fix multi-update-locks for this merge to be complete BUILD/SETUP.sh: Portability fix client/mysqltest.c: Portability fix mysql-test/r/drop.result: updated results mysql-test/r/func_str.result: New warnings (after merge) mysql-test/r/insert.result: Updated tests mysql-test/r/join_nested.result: Updated results (because of new column types in 5.0) mysql-test/r/lock_multi.result: Temporarly wrong results until Sanja fixes multi-update-lock in 5.0 mysql-test/r/multi_update.result: Temporary fix until Sanja fixes multi-update locking mysql-test/r/ps_1general.result: Update of results after merge mysql-test/r/ps_2myisam.result: Update of results after merge mysql-test/r/ps_3innodb.result: Update of results after merge mysql-test/r/ps_4heap.result: Update of results after merge mysql-test/r/ps_5merge.result: Update of results after merge mysql-test/r/ps_6bdb.result: Update of results after merge mysql-test/r/query_cache.result: Update of results after merge mysql-test/r/range.result: New results for new tests mysql-test/r/rpl_auto_increment.result: Update with new 4.0 information mysql-test/r/rpl_charset.result: After merge fixes mysql-test/r/subselect.result: After merge fixes mysql-test/r/view.result: Temporary fix until multi-update-locking is fixed mysql-test/t/drop.test: Safety fix mysql-test/t/multi_update.test: Temporary fix until multi-update-locking is fixed mysql-test/t/rpl_charset.test: More comments mysql-test/t/sp-error.test: Updated comments mysql-test/t/view.test: Temporary fix until multi-update-locking is fixed scripts/mysql_fix_privilege_tables.sh: Better error message sql-common/client.c: More debugging sql/ha_ndbcluster.cc: After merge fixes sql/handler.cc: After merge fixes sql/item.cc: Simple optimization of creating item After merge fixed Added Item_field::set_no_const_sub() to be able to mark fields that can't be substituted The problem is that if you compare a string field to a binary string, you can't replace the field with a string constant as the binary comparison may then fail (The original field value may be in a different case) sql/item.h: Added Item::set_no_const_sub() to be able to mark fields that can't be substituted sql/item_cmpfunc.cc: Mark fields compared as binary to not be substituted. sql/item_func.cc: After merge fix sql/log_event.cc: After merge fix sql/mysql_priv.h: After merge fix sql/opt_range.cc: After merge fix sql/protocol.cc: Made flags uint instead of int (as it's used as a bit mask) sql/protocol.h: Made flags uint instead of int (as it's used as a bit mask) sql/protocol_cursor.cc: Made flags uint instead of int (as it's used as a bit mask) Indentation cleanups sql/sp.cc: After merge fixes Removed compiler warnings sql/sp_head.cc: After merge fixes sql/sql_base.cc: After merge fixes Removed 'send_error' from 'insert_fields()' as the error is sent higher up sql/sql_class.cc: Give assert if set_n_backup_item_arena is used twice sql/sql_class.h: Give assert if set_n_backup_item_arena is used twice After merge fixes Added 'simple_select' method to be able to quickly determinate if a select_result is a normal SELECT sql/sql_handler.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_prepare.cc: After merge fixes sql/sql_select.cc: After merge fixes Moved 'build_equal_items' to optimize_cond() (logical place) sql/sql_table.cc: After merge fixes sql/sql_trigger.cc: After merge fixes sql/sql_update.cc: After merge fixes (This should be fixed by Sanja to have lower granuality locking of tables in multi-update) sql/sql_view.cc: After merge fixes sql/sql_yacc.yy: After merge fixes Don't have FOUND as a reserved keyword
* | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2004-10-151-10/+10
|\ \ | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-ndb
| * | compile-hpux11-parisc2-aCC:unknown2004-10-151-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Fix a typo. Cleanup. BUILD/compile-hpux11-parisc2-aCC: Fix a typo. Cleanup.
* | | Don't compile -O1 if --with-debug=full (as it can optimize away the call stack)unknown2004-10-041-2/+9
|/ /
* | Mergeunknown2004-08-051-1/+1
|\ \ | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: SCCS merged