into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
into mysql.com:/users/lthalmann/bk/MERGE/mysql-5.1-merge
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/sql_show.cc:
Auto merged
storage/myisam/mi_open.c:
Auto merged
into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb
storage/ndb/include/util/UtilBuffer.hpp:
Auto merged
storage/ndb/src/common/util/SimpleProperties.cpp:
Auto merged
into mysql.com:/home/cps/mysql/devel/5.1-rename-bug
mysql-test/r/log_tables.result:
Auto merged
mysql-test/t/log_tables.test:
Auto merged
sql/handler.cc:
Auto merged
sql/handler.h:
Auto merged
sql/log.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_delete.cc:
Auto merged
sql/sql_rename.cc:
Auto merged
sql/table.cc:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
sql/log.cc:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_table.cc:
manual merge
into siva.hindu.god:/usr/home/tim/m/bk/51
include/m_ctype.h:
Auto merged
mysql-test/include/mix1.inc:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/innodb_mysql.result:
Auto merged
mysql-test/r/rename.result:
Auto merged
mysql-test/r/subselect.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/subselect.test:
Auto merged
mysql-test/t/view.test:
Auto merged
mysys/mf_iocache.c:
Auto merged
sql/item_func.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_lex.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
storage/myisam/sort.c:
Manual merge
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
storage/ndb/src/mgmsrv/Services.cpp:
revert fix bug#21052 as it's wrong, and induces bus-error on node crashes
Fixes:
- Bug #23368: crash during insert, table has foreign key pointing into other schema,permission
storage/innobase/dict/dict0dict.c:
Applied InnoDB snapshot 5.1-ss927
Revision r927:
dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name()
instead of passing the wrong length to ut_print_namel(). (Bug #23368)
ut_print_name(), ut_print_namel(): Document the special treatment of '/'.
ut_print_namel(): Replace strchr() with memchr(), as the string might
not be NUL-terminated.
storage/innobase/include/ut0ut.h:
Applied InnoDB snapshot 5.1-ss927
Revision r927:
dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name()
instead of passing the wrong length to ut_print_namel(). (Bug #23368)
ut_print_name(), ut_print_namel(): Document the special treatment of '/'.
ut_print_namel(): Replace strchr() with memchr(), as the string might
not be NUL-terminated.
storage/innobase/ut/ut0ut.c:
Applied InnoDB snapshot 5.1-ss927
Revision r927:
dict_print_info_on_foreign_key_in_create_format(): Use ut_print_name()
instead of passing the wrong length to ut_print_namel(). (Bug #23368)
ut_print_name(), ut_print_namel(): Document the special treatment of '/'.
ut_print_namel(): Replace strchr() with memchr(), as the string might
not be NUL-terminated.
Fixes:
- Bug #18077: InnoDB uses full explicit table locks in stored FUNCTION
storage/innobase/btr/btr0btr.c:
Apply InnoDB snapshot ss923
Revision r919:
btr_page_get_father_for_rec(): Remove bogus comment about removed dict_tree_t.
storage/innobase/dict/dict0dict.c:
Apply InnoDB snapshot ss923
Revision r892:
Merge changes from MySQL AB.
dict_col_copy_type_noninline(): Remove the return statement.
Some compilers do not allow return expressions of void type.
innobase_start_or_create_for_mysql(): Do not cap srv_max_threads to 1000
on Windows.
Makefile.am (EXTRA_DIST): Add plug.in
Revision r897:
dict_index_get_if_in_cache(): Enclose in #ifdef UNIV_DEBUG.
Replace the search loop with a call to dict_index_find_on_id_low().
storage/innobase/handler/ha_innodb.cc:
Apply InnoDB snapshot ss923
Revision r887:
storage/innobase/handler: Merge changes from MySQL AB:
ChangeSet
2006/09/30 18:44:42-07:00 brian@zim.(none)
Merge zim.(none):/home/brian/mysql/merge-5.1
into zim.(none):/home/brian/mysql/arch-5.1
ChangeSet
2006/09/30 12:49:46-07:00 brian@zim.(none)
This patch adds handlerton passing to functions. NDB and Innodb still require a global hanlderton in the main code due to the nature of the sql_cache call back function (should be solveable... another patch).
Partitioning now has a flag to allow disabling of engines from being compatible with partitioning. Cleaned up heap naming convention on panic call.
ChangeSet
2006/09/29 17:19:02-07:00 brian@zim.(none)
This removes the passing of global hton to engine instance.
ChangeSet
2006/09/28 13:22:56+02:00 gbichot@dl145h.mysql.com
Merge gbichot@bk-internal:/home/bk/mysql-5.1-arch
into dl145h.mysql.com:/users/gbichot/mysql-5.1-arch
ChangeSet
2006/09/28 13:19:43+02:00 gbichot@dl145h.mysql.com
In the handlerton, cursor creation function don't have an argument
and so the engine calls current_thd to derive transaction information;
instead we now pass THD to those functions, it looks more logical
(it makes the implicit current_thd parameter more visible).
Approved by Brian and Monty.
ChangeSet
2006/09/26 22:51:53-07:00 brian@zim.(none)
Merge zim.(none):/home/brian/mysql/merge-5.1
into zim.(none):/home/brian/mysql/arch-5.1
Revision r895:
Merge changes from MySQL AB, and remove two compilation warnings.
ha_innodb.cc: innodb_mutex_show_status(): Add (ulong) casts to
ulonglong expressions being passed to fprintf %lu. The warnings
were apparently introduced by MySQL AB developers.
mysql_declare_plugin(innobase): Add PLUGIN_LICENSE_GPL.
have_innodb.inc: Merge changes from MySQL AB.
Revision r923:
ha_innobase::store_lock(): When downgrading table locks, do not
check thd->in_lock_tables but test if
thd->lex->sql_command == SQLCOM_LOCK_TABLES
instead. Otherwise, stored functions will use table locks. (Bug #18077)
This patch is from Heikki.
storage/innobase/include/dict0dict.h:
Apply InnoDB snapshot ss923
Revision r897:
dict_index_get_if_in_cache(): Enclose in #ifdef UNIV_DEBUG.
Replace the search loop with a call to dict_index_find_on_id_low().
storage/innobase/include/mem0dbg.h:
Apply InnoDB snapshot ss923
Revision r901:
Enclose some mem debug functions in #ifdef UNIV_DEBUG or #ifdef UNIV_MEM_DEBUG.
storage/innobase/include/mtr0mtr.h:
Apply InnoDB snapshot ss923
Revision r866:
mtr_print(), mtr_memo_contains(): Disable unless #ifdef UNIV_DEBUG.
storage/innobase/include/mtr0mtr.ic:
Apply InnoDB snapshot ss923
Revision r866:
mtr_print(), mtr_memo_contains(): Disable unless #ifdef UNIV_DEBUG.
storage/innobase/include/sync0rw.h:
Apply InnoDB snapshot ss923
Revision r907:
Send all SHOW ENGINE INNODB STATUS information to the client also when
UNIV_SYNC_DEBUG is defined.
rw_lock_list_print_info(): Add parameter "file".
mutex_list_print_info(): Add parameter "file". Make the function static.
storage/innobase/include/sync0sync.h:
Apply InnoDB snapshot ss923
Revision r907:
Send all SHOW ENGINE INNODB STATUS information to the client also when
UNIV_SYNC_DEBUG is defined.
rw_lock_list_print_info(): Add parameter "file".
mutex_list_print_info(): Add parameter "file". Make the function static.
storage/innobase/include/univ.i:
Apply InnoDB snapshot ss923
Revision r894:
univ.i: Indent some of the directives, and remove conditions about Windows
in the "#else" branch of "#if building on Windows".
storage/innobase/mem/mem0dbg.c:
Apply InnoDB snapshot ss923
Revision r901:
Enclose some mem debug functions in #ifdef UNIV_DEBUG or #ifdef UNIV_MEM_DEBUG.
Revision r902:
mem0dbg.c: Enclose some more function definitions in #ifdef UNIV_MEM_DEBUG.
The declarations were already enclosed in #ifdef UNIV_MEM_DEBUG.
storage/innobase/mem/mem0pool.c:
Apply InnoDB snapshot ss923
Revision r896:
mem0pool.c: Remove obsolete comments about the dictionary cache being
managed with an LRU algorithm.
storage/innobase/mtr/mtr0mtr.c:
Apply InnoDB snapshot ss923
Revision r866:
mtr_print(), mtr_memo_contains(): Disable unless #ifdef UNIV_DEBUG.
storage/innobase/row/row0purge.c:
Apply InnoDB snapshot ss923
Revision r869:
row_purge_parse_undo_rec(): Correct a faulty condition. Luckily, this
bug would only surface if the InnoDB SQL interpreter were used for
updating fixed-length columns. Currently (as the UPD_NODE_NO_SIZE_CHANGE
flag is never set), cmpl_info can only be 0 or UPD_NODE_NO_ORD_CHANGE.
Luckily, UPD_NODE_NO_ORD_CHANGE is 1, and the condition was simplified
to !cmpl_info.
storage/innobase/sync/sync0rw.c:
Apply InnoDB snapshot ss923
Revision r907:
Send all SHOW ENGINE INNODB STATUS information to the client also when
UNIV_SYNC_DEBUG is defined.
rw_lock_list_print_info(): Add parameter "file".
mutex_list_print_info(): Add parameter "file". Make the function static.
storage/innobase/sync/sync0sync.c:
Apply InnoDB snapshot ss923
Revision r907:
Send all SHOW ENGINE INNODB STATUS information to the client also when
UNIV_SYNC_DEBUG is defined.
rw_lock_list_print_info(): Add parameter "file".
mutex_list_print_info(): Add parameter "file". Make the function static.
into perch.ndb.mysql.com:/home/jonas/src/51-work
storage/ndb/include/kernel/ndb_limits.h:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
merge
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
mysql-test/r/myisam.result:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_select.cc:
Auto merged
storage/ndb/src/common/util/File.cpp:
Avoid memory leak when EINTR error returns. Even though a close error happens, a ERROR message in out-file is given, and this shouldn't affect the normally running.
added check in ndb_mgmd so that the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max Uint32 number.
storage/ndb/src/mgmsrv/ConfigInfo.cpp:
the sum of MaxNoOfTables, MaxNoOfOrderedIndexes, MaxNoOfUniqueHashIndexes and the number of System Tables must not overflow the max value of Uint32.
into mysql.com:/home/svoj/devel/mysql/engines/mysql-5.1-engines
mysql-test/t/repair.test:
Auto merged
sql/sql_base.cc:
Auto merged
storage/myisam/sort.c:
Auto merged
mysql-test/r/repair.result:
Manual merge.
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.1-opt
mysql-test/r/view.result:
Auto merged
mysql-test/t/view.test:
Auto merged
sql/table.cc:
Auto merged
and use it for testOperations/testTransactions
storage/ndb/test/include/NDBT_Test.hpp:
Add support for temporary tables in hugo
storage/ndb/test/ndbapi/testOperations.cpp:
Make testOperations use temporary tables
storage/ndb/test/ndbapi/testTransactions.cpp:
Make testTransactions use temporary tables
storage/ndb/test/src/NDBT_Tables.cpp:
Add support for temporary tables in hugo
storage/ndb/test/src/NDBT_Test.cpp:
Add support for temporary tables in hugo
fix another incorrect assertion
storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
clear m_transaction_nodes.clear()
to avoid asserion in debug-compiled in releaseApiCon
Dont assert when getting gci=0 in read only transaction
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Dont assert when getting gci=0 in read only transaction
storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Add a parameter id parameter for setSize method. When allocating memory error results in ndbd exit can gives exact parameter name in error log.
make sure not to release log buffer twice (or several times) in case of abort of multi update
storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp:
make sure not to release log buffer twice (or several times) in case of abort of multi update
Problem is that some files moved to storage/*/ still are dependent
on sql/ code (usually use members of THD structure)
that can get different being compiled with another #define-s
Code added to recompile these for the embedded server
config/ac-macros/plugins.m4:
macros added to check if the storage has sql/ - dependent code
libmysqld/Makefile.am:
symlink files from storage/*/ needed to be recompiled
with EMBEDDED_LIBRARY
storage/federated/plug.in:
ha_federated.cc uses THD structure
storage/heap/plug.in:
ha_heap.cc uses THD structure
storage/innobase/plug.in:
ha_innodb.cc uses THD structure
storage/myisam/plug.in:
ha_myisam.cc uses THD structure
storage/myisammrg/plug.in:
ha_myisammrg.cc uses THD structure
ndb_restore tool should create them.
storage/ndb/tools/restore/consumer.hpp:
Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.cpp:
Implement to create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/consumer_restore.hpp:
Add create apply_status and schema system table method when they don't exist.
storage/ndb/tools/restore/restore_main.cpp:
if apply_status and schema system tables don't exist, create them also.
into willster.(none):/home/stewart/Documents/MySQL/5.1/bug19914-mk2-merge
BitKeeper/deleted/.del-ha_berkeley.cc:
Auto merged
BitKeeper/deleted/.del-ha_berkeley.h:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
sql/item_sum.cc:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
storage/archive/ha_archive.cc:
Auto merged
storage/blackhole/ha_blackhole.cc:
Auto merged
storage/blackhole/ha_blackhole.h:
Auto merged
storage/csv/ha_tina.cc:
Auto merged
storage/csv/ha_tina.h:
Auto merged
storage/example/ha_example.cc:
Auto merged
storage/example/ha_example.h:
Auto merged
storage/federated/ha_federated.cc:
Auto merged
storage/federated/ha_federated.h:
Auto merged
storage/heap/ha_heap.cc:
Auto merged
storage/heap/ha_heap.h:
Auto merged
storage/myisam/ha_myisam.h:
Auto merged
storage/myisammrg/ha_myisammrg.cc:
Auto merged
storage/ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
storage/ndb/include/mgmapi/mgmapi.h:
Auto merged
storage/ndb/include/ndb_version.h.in:
Auto merged
storage/ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
storage/ndb/src/kernel/vm/Configuration.cpp:
Auto merged
storage/ndb/src/mgmapi/mgmapi.cpp:
Auto merged
storage/ndb/src/mgmclient/main.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbScanOperation.cpp:
Auto merged
storage/ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
storage/ndb/tools/ndb_condig.cpp:
Auto merged
storage/ndb/tools/restore/restore_main.cpp:
Auto merged
sql/ha_ndbcluster.cc:
merge
sql/ha_ndbcluster.h:
merge
sql/handler.h:
merge
sql/sql_delete.cc:
merge
storage/archive/ha_archive.h:
merge
storage/innobase/handler/ha_innodb.cc:
merge
storage/innobase/handler/ha_innodb.h:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisammrg/ha_myisammrg.h:
merge
Early abort, failing to allocate buffers, would go down the abort track and
end up trying to sendDropTriggers (as the standard stop backup does).
However, it is possible to not have any tables yet defined in the backup
(due to allocating buffers is before this). Simple check in sendDropTrig
(and continue to next step). Files may be open, so we continue to close them.
Also updated ERROR_Codes (and added one to test this bug).
storage/ndb/src/kernel/blocks/ERROR_codes.txt:
update BACKUP error insert codes to reflect current reality.
storage/ndb/src/kernel/blocks/backup/Backup.cpp:
Allow for early abort when no tables have been included in backup.
Allow for abort when file records have been seized but not yet allocated
to specific uses (is the case when buffer allocation fails)
storage/ndb/src/kernel/blocks/backup/Backup.hpp:
initialize BackupRecord file Ptrs
storage/ndb/test/src/NdbBackup.cpp:
Add extra failure codes for buffer allocation failure in backup
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp:
Fix uninit variable, causing problems with auto-increment on rhas3-x86 (only found on this platform, really weird)
correct segment fault in setSize(),
and improve the error message with displaying the specific parameter's name if malloc fail
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp:
add an argument refer to the ID of a parameter which will be malloced
storage/ndb/src/kernel/vm/ArrayPool.hpp:
in setSize(), correct the segment default due to overflow of two 32-bit interger's multiply
storage/ndb/include/mgmapi/mgmapi.h:
add a new function declaration
storage/ndb/src/mgmapi/Makefile.am:
add a link of a new file ParamInfo.cpp which locate in mgmsrv dir
storage/ndb/src/mgmapi/mgmapi_configuration.cpp:
add a new mgmapi function ndb_mgm_get_db_parameter_info
storage/ndb/src/mgmsrv/ParamInfo.cpp:
New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.cpp''
initialization information of all parameters, this copy from mgmsrv/ConfigInfo.cpp
storage/ndb/src/mgmsrv/ParamInfo.hpp:
New BitKeeper file ``storage/ndb/src/mgmsrv/ParamInfo.hpp''
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint
BitKeeper/etc/collapsed:
auto-union
BitKeeper/etc/ignore:
auto-union
Makefile.am:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
client/mysqltest.c:
Auto merged
configure.in:
Auto merged
include/m_ctype.h:
Auto merged
include/my_global.h:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/binlog_row_mix_innodb_myisam.result:
Auto merged
mysql-test/r/csv.result:
Auto merged
mysql-test/r/ctype_utf8.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/partition.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/r/strict.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/csv.test:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
mysql-test/t/partition.test:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/field.cc:
Auto merged
sql/filesort.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/item_timefunc.h:
Auto merged
sql/log.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
vio/viosocket.c:
Auto merged
found with gcc 4.0.2 on Itanium2
(ndb_dd_* failures)
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
Fix some potentil alias problems
storage/ndb/src/kernel/vm/Pool.hpp:
Fix potential alias problem
