summaryrefslogtreecommitdiff
path: root/BitKeeper
Commit message (Collapse)AuthorAgeFilesLines
* This changeset contains changes approved in code review by unknown2005-03-151-0/+1
| | | | | | | | | | | | | | | | | | Konstja and Georg, change sets 1.1806, 1.1805. These changes has been successfully tested on both my own workstation (Suse 9.0) and production.mysql.com. mysql-test/r/federated.result: new test results for error handling tests. mysql-test/t/federated.test: new error handling tests sql/ha_federated.cc: - check_foreign_data source added - table names now enclosed in '`' to allow for '%' or other characters - better error handling - mysql_init now checked to see if it returns true/false, error out if false (Georg) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* Removed files that disabled ndb testsunknown2005-03-141-1/+8
|
* Marked missing file goneunknown2005-03-141-0/+2
|
* Removedunknown2005-03-141-1/+1
|
* mergedunknown2005-03-091-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union Build-tools/Do-compile: Auto merged client/mysql.cc: Auto merged client/mysqldump.c: Auto merged include/my_sys.h: Auto merged innobase/buf/buf0lru.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/include/page0page.ic: Auto merged innobase/include/srv0srv.h: Auto merged innobase/os/os0thread.c: Auto merged innobase/rem/rem0cmp.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_parser.c: Auto merged myisam/mi_create.c: Auto merged mysql-test/Makefile.am: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/mysqldump.result: Auto merged mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/t/mysqldump.test: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged mysys/hash.c: Auto merged mysys/my_bitmap.c: Auto merged ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/make_win_src_distribution.sh: Auto merged sql/net_serv.cc: Auto merged sql/sql_select.cc: Auto merged
| * New Project files for Windows Ithanium 64-bit buildsunknown2005-03-061-0/+1
| | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge in fix Bug#3788unknown2005-03-081-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/information_schema.result: Auto merged mysql-test/t/sp.test: Auto merged sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/sp.cc: Auto merged sql/sp_head.cc: Auto merged sql/sp_head.h: Auto merged sql/sql_parse.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_yacc.yy: Auto merged mysql-test/r/sp.result: Merge BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Default value of slave_transaction_retries is now 10unknown2005-03-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | (whereas it's 0 in 4.1, for safety as this is new code). BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Mergeunknown2005-03-051-0/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union innobase/trx/trx0trx.c: Auto merged mysql-test/r/ctype_collate.result: Auto merged mysql-test/r/func_system.result: Auto merged mysql-test/r/type_blob.result: Auto merged sql/ha_innodb.cc: Auto merged sql/item.cc: Auto merged sql/item.h: Auto merged sql/item_create.cc: Auto merged sql/item_func.cc: Auto merged sql/item_strfunc.cc: Auto merged sql/item_strfunc.h: Auto merged sql/opt_sum.cc: Auto merged innobase/ut/ut0mem.c: e merge from 4.1 mysql-test/r/func_group.result: merge from 4.1 mysql-test/r/func_str.result: merge from 4.1 mysql-test/t/func_group.test: merge from 4.1
| * logging_ok:unknown2005-03-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging to logging@openlogging.org accepted func_group.result, func_group.test: Added a test case for bug #8893. opt_sum.cc: A misplaced initialization for the returned parameter prefix_len in the function find_key_for_maxmin caused usage of a wrong key prefix by the min/max optimization in cases when the matching index was not the first index that contained the min/max field. sql/opt_sum.cc: A misplaced initialization for the returned parameter prefix_len in the function find_key_for_maxmin caused usage of a wrong key prefix by the min/max optimization in cases when the matching index was not the first index that contained the min/max field. mysql-test/t/func_group.test: Added a test case for bug #8893. mysql-test/r/func_group.result: Added a test case for bug #8893. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-5.0unknown2005-02-241-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-repl-5.0 BitKeeper/etc/logging_ok: auto-union sql/sql_parse.cc: Auto merged
| * | Changes to allow 5.0.3 to compile on Windows after XA was pushedunknown2005-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | logging_ok: Logging to logging@openlogging.org accepted mi_packrec.c: Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap mi_extra.c: Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h my_mmap.c: Changed how no mmap message is printed for Windows sql_map.cc: Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap sql/sql_map.cc: Changed HAVE_MMAP to HAVE_SYS_MMAN_H and replaced calls to mmap and munmap with my_mmap and my_munmap mysys/my_mmap.c: Changed how no mmap message is printed for Windows myisam/mi_extra.c: Now using HAVE_SYS_MMAN_H to protect include of sys/mman.h myisam/mi_packrec.c: Using HAVE_SYS_MMAN_H to protect include of sys/mman.h and replaced calls to mmap and munmap with my_mmap and my_munmap BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | Merge with 4.1unknown2005-02-221-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union client/mysql.cc: Auto merged extra/my_print_defaults.c: Auto merged include/m_string.h: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/r/user_var.result: Auto merged mysql-test/t/user_var.test: Auto merged scripts/make_binary_distribution.sh: Auto merged sql/item_func.cc: Auto merged sql/sql_yacc.yy: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-ucs2.c: Auto merged strings/ctype-utf8.c: Auto merged libmysql/libmysql.c: ul mysql-test/r/ps_1general.result: Merge mysql-test/t/derived.test: Merge mysql-test/t/ps_1general.test: Merge mysql-test/t/type_float.test: Merge sql/field.cc: ul sql/item.cc: ul sql/item.h: ul sql/item_func.h: ul sql/item_strfunc.cc: ul sql/item_sum.cc: ul sql/item_sum.h: ul sql/procedure.h: ul sql/sql_derived.cc: Trivial merge sql/sql_parse.cc: ul sql/sql_update.cc: Trivial merge strings/strtod.c: Use updated code from 4.1 This is bascily same code as we had before or 5.0, execpt that we now have higher accuracy for floating points value that are integers (like 123.45E+02)
| | * Merge 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/mysql-4.1unknown2005-02-221-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 51.0.168.192.in-addr.arpa:/Users/bell/mysql/bk/work-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Post review changesunknown2005-02-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/table.cc: added comments small optimisation fixed bug: in case of view based on several views, set_uncestor called only for first BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Mergeunknown2005-02-202-7/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/item.cc: Auto merged sql/item_func.cc: Auto merged sql/protocol.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/table.cc: Auto merged tests/mysql_client_test.c: Auto merged BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-181-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0-8583 BitKeeper/etc/logging_ok: auto-union
| | * \ \ Merged test caseunknown2005-02-171-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/ha_ndbcluster.cc: Auto merged mysql-test/r/ndb_autodiscover.result: Merge BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | | * \ \ Manual mergeunknown2005-02-111-1/+0
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/select.result: Auto merged
| * | | | | Mergeunknown2005-02-171-0/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged mysql-test/r/lowercase_table2.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/variables.test: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_parse.cc: Auto merged tests/mysql_client_test.c: Auto merged mysql-test/r/system_mysql_db.result: Update results scripts/mysql_create_system_tables.sh: Merge fix for Bug #7617, making enum fields in grant tables case-insensitive. scripts/mysql_fix_privilege_tables.sql: Merge fix for Bug #7617, and fix additional enum/set columns. sql/sql_acl.cc: Hand-merge due to whitespace change sql/sql_lex.cc: Hand-merge bug fix.
| | * | | Merge mysql.com:/home/jimw/my/mysql-4.0-cleanunknown2005-02-171-0/+7
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.1-clean BitKeeper/triggers/post-commit: Auto merged
| | | * \ \ Merge mysql.com:/home/jimw/my/mysql-4.0-no-merge-spamunknown2005-02-171-0/+7
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| | | | * | | Make post-commit trigger not send emails when the message would not containunknown2005-02-161-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any actual changes. (Often the case in merges where the only change involves renumbering ChangeSet entries.) BitKeeper/triggers/post-commit: Suppress emails when there's no changes actually reported
| * | | | | | Merge mysql.com:/home/dellis/bkl/bug-4.1unknown2005-02-161-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dellis/bkl/bug-5.0 BitKeeper/etc/logging_ok: auto-union mysql-test/r/fulltext.result: Auto merged
| | * | | | | Merge mysql.com:/home/dellis/mysqlab/bk/mysql-4.0unknown2005-02-151-0/+1
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/dellis/bkl/bug-4.1 BitKeeper/etc/logging_ok: auto-union myisam/ft_nlq_search.c: Auto merged
| | | * | | | ft_nlq_search.c:unknown2005-02-151-0/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522) myisam/ft_nlq_search.c: Added bounds check to avoid accessing unallocated FT_DOC array. (BUG #8522) BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | | | Merge with 4.1unknown2005-02-152-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged innobase/row/row0mysql.c: Auto merged myisam/ft_boolean_search.c: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/distinct.result: Auto merged mysql-test/r/fulltext.result: Auto merged mysql-test/r/select.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/union.test: Auto merged sql/item_strfunc.cc: Auto merged sql/sql_cache.cc: Auto merged sql/sql_class.cc: Auto merged sql/sql_list.h: Auto merged sql/examples/ha_archive.cc: Auto merged sql/sql_parse.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_string.h: Auto merged vio/viosocket.c: Auto merged scripts/mysql_create_system_tables.sh: simple merge sql/field.cc: simple merge sql/item.h: simple merge sql/sql_lex.h: simple merge sql/sql_yacc.yy: Merge (join_table_list was not comptely merged. Need to run test to know how things works...) sql/table.cc: Keep code from 5.0, except delted one not needed line strings/ctype-ucs2.c: Auto merge
| | * | | Bug#8351unknown2005-02-141-0/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for crash when using a double quote in boolean fulltext query. mysql-test/r/fulltext.result: Added a test case for bug #8351. mysql-test/t/fulltext.test: Added a test case for bug #8351. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| | * | Manual mergeunknown2005-02-111-1/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Auto merged sql/table.cc: Auto merged
| | | * Fix extra blank line in emails sent by post-commit trigger.unknown2005-02-101-1/+0
| | | | | | | | | | | | | | | | | | | | BitKeeper/triggers/post-commit: Remove extra blank link
| * | | Mergeunknown2005-02-111-6/+13
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union BitKeeper/triggers/post-commit: Auto merged include/my_pthread.h: Auto merged mysql-test/r/select.result: Auto merged mysql-test/t/select.test: Auto merged sql/item.cc: Auto merged sql/log.cc: Auto merged sql/table.cc: SCCS merged
| * | Merge commit triggerunknown2005-02-101-6/+13
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union extra/replace.c: Auto merged BitKeeper/triggers/post-commit: Merge changes
| | * Merge bk-internal:/home/bk/mysql-4.0unknown2005-02-101-6/+13
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-4.0-clean
| | | * Add BUG# to subject and X-Bug header for all outgoingunknown2005-01-251-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | emails re: bug fixes, and update the URL for the manual page on installing from the source tree. Fake bug number for testing: Bug #1234 BitKeeper/triggers/post-commit: Update URL for docs page
| | * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-02-041-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-041-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/4.1 BitKeeper/etc/logging_ok: auto-union
| | * | type_float.result.es updated.unknown2005-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_float.result.es: Updated. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-02-031-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | into orca.ndb.mysql.com:/export/home/mikael/mysql-4.1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-311-0/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into zim.(none):/home/brian/mysql/mysql-4.1 BitKeeper/etc/logging_ok: auto-union
| | * | Cleanup for lost file descriptors on close table for ha_archive. unknown2005-01-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/examples/ha_archive.cc: More comments, fixed issue with lost file descriptors. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | BUG#8208 don't fsync unless something has been writtenunknown2005-01-311-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | + ion shutdown - don't close files that are not open + abort in debug - if closing a fd == -1 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | Mergeunknown2005-02-091-0/+1
|\ \ \
| * | | Removed old filesunknown2005-02-092-0/+393
| | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | gone:unknown2005-02-091-0/+393
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merged auto-union BitKeeper/etc/gone: merged
* | | | clean up goneunknown2005-02-091-13/+0
|/ / /
* | | Merge neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0unknown2005-02-041-0/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.homeip.net:/home/msvensson/mysql/mysql-5.0-cluster-extra BitKeeper/etc/logging_ok: auto-union sql/ha_innodb.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_class.h: Auto merged
| * | | type_float.result.es updatedunknown2005-02-041-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/type_float.result.es: Updated. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
| * | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into orca.ndb.mysql.com:/export/home/mikael/mysql-5.0 BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
* | | | Merged "query cache for ndb" to 5.0unknown2005-02-031-0/+2
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union sql/ha_innodb.cc: Auto merged sql/ha_ndbcluster.h: Auto merged sql/handler.cc: Auto merged sql/mysql_priv.h: Auto merged sql/mysqld.cc: Auto merged sql/set_var.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_class.h: Auto merged sql/ha_innodb.h: Hand merged sql/ha_ndbcluster.cc: Merge with gathering of stats sql/sql_cache.cc: Use new table def cache sql/table.h: table.h had been cleaned up
| * | | Merge problem unknown2005-01-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FC3 fix sql/ha_ndbcluster.cc: Fixed merge problem, that occured when m_ndb where removed. Fix fo FC3 compile problem. BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
View Lorry Controller Status