2680 Daniel Fischer 2008-07-25 [merge]
merge from mysql-6.0-build
removed:
mysql-test/r/maria3.result
mysql-test/r/merge-big.result
mysql-test/r/parser.result
mysql-test/t/maria3.test
mysql-test/t/merge-big.test
mysql-test/t/parser.test
sql/backup/debug.h
added:
mysql-test/include/ctype_ascii_order.inc
mysql-test/include/ctype_datetime.inc
mysql-test/include/have_debug_sync.inc
mysql-test/r/backup_charsets.result
mysql-test/r/backup_commit_restore.result
mysql-test/r/backup_compression.result
mysql-test/r/backup_lock_myisam.result
mysql-test/r/backup_many_dbs.result
mysql-test/r/backup_multi_blocks.result
mysql-test/r/backup_myisam1.result
mysql-test/r/backup_myisam2.result
mysql-test/r/backup_no_be.result
mysql-test/r/backup_nodata_driver.result
mysql-test/r/backup_procedures.result
mysql-test/r/backup_triggers_and_events.result
mysql-test/r/backup_view_on_view.result
mysql-test/r/backup_views.result
mysql-test/r/ctype_cp866.result
mysql-test/r/debug_sync.result
mysql-test/r/have_debug_sync.require
mysql-test/r/maria-autozerofill.result
mysql-test/r/maria-big2.result
mysql-test/r/maria3.result
mysql-test/r/merge-sync.result
mysql-test/r/myisamlog.result
mysql-test/r/parser.result
mysql-test/r/parser_stack.result
mysql-test/suite/backup/
mysql-test/suite/backup/r/
mysql-test/suite/backup/r/backup_online_testing.result
mysql-test/suite/backup/t/
mysql-test/suite/backup/t/backup_online_testing.test
mysql-test/t/backup_charsets.test
mysql-test/t/backup_commit_restore.test
mysql-test/t/backup_compression.test
mysql-test/t/backup_lock_myisam.test
mysql-test/t/backup_many_dbs.test
mysql-test/t/backup_multi_blocks.test
mysql-test/t/backup_myisam1-master.opt
mysql-test/t/backup_myisam1.test
mysql-test/t/backup_myisam2.test
mysql-test/t/backup_no_be.test
mysql-test/t/backup_nodata_driver.test
mysql-test/t/backup_procedures.test
mysql-test/t/backup_triggers_and_events.test
mysql-test/t/backup_view_on_view.test
mysql-test/t/backup_views.test
mysql-test/t/ctype_cp866.test
mysql-test/t/debug_sync.test
mysql-test/t/maria-autozerofill.test
mysql-test/t/maria-big2.test
mysql-test/t/maria3.test
mysql-test/t/merge-sync.test
mysql-test/t/myisamlog-master.opt
mysql-test/t/myisamlog.test
mysql-test/t/parser.test
mysql-test/t/parser_stack.test
sql/backup/backup_info.cc
sql/backup/backup_info.h
sql/backup/be_logical.h
sql/backup/be_nodata.cc
sql/backup/be_nodata.h
sql/backup/restore_info.h
sql/debug_sync.cc
storage/myisam/mi_examine_log.c
storage/myisam/myisam_backup_engine.cc
renamed:
sql/backup/catalog.cc => sql/backup/image_info.cc
sql/backup/catalog.h => sql/backup/image_info.h
modified:
.bzr-mysql/default.conf
.bzrignore
CMakeLists.txt*
client/client_priv.h
client/mysql.cc
client/mysqltest.c
configure.in
dbug/CMakeLists.txt*
include/atomic/generic-msvc.h
include/atomic/nolock.h
include/config-win.h
include/keycache.h
include/my_global.h
include/my_sys.h
include/myisam.h
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
mysql-test/extra/binlog_tests/mix_innodb_myisam_binlog.test
mysql-test/extra/rpl_tests/rpl_row_basic.test
mysql-test/include/mix1.inc
mysql-test/include/query_prealloc_size_basic.inc
mysql-test/include/transaction_prealloc_size_basic.inc
mysql-test/lib/mtr_report.pl
mysql-test/mysql-test-run.pl*
mysql-test/r/backup.result
mysql-test/r/backup_commit_blocker.result
mysql-test/r/backup_ddl_blocker.result
mysql-test/r/backup_errors.result
mysql-test/r/backup_objects.result
mysql-test/r/backup_progress.result
mysql-test/r/backup_snapshot.result
mysql-test/r/character_set_server_func.result
mysql-test/r/client_xml.result
mysql-test/r/ctype_big5.result
mysql-test/r/ctype_gb2312.result
mysql-test/r/ctype_gbk.result
mysql-test/r/ctype_tis620.result
mysql-test/r/ctype_ucs.result
mysql-test/r/ctype_utf16.result
mysql-test/r/ctype_utf32.result
mysql-test/r/ctype_utf8.result
mysql-test/r/fulltext2.result
mysql-test/r/func_in.result
mysql-test/r/func_misc.result
mysql-test/r/innodb_mysql.result
mysql-test/r/maria-mvcc.result
mysql-test/r/maria-preload.result
mysql-test/r/maria.result
mysql-test/r/merge.result
mysql-test/r/mysql.result
mysql-test/r/mysqltest.result
mysql-test/r/partition_pruning.result
mysql-test/r/query_prealloc_size_basic_32.result
mysql-test/r/query_prealloc_size_basic_64.result
mysql-test/r/transaction_prealloc_size_basic_32.result
mysql-test/r/transaction_prealloc_size_basic_64.result
mysql-test/r/xml.result
mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result
mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
mysql-test/suite/falcon/r/falcon_bug_32833.result
mysql-test/suite/funcs_1/r/is_columns_mysql.result
mysql-test/suite/funcs_1/r/processlist_priv_ps.result
mysql-test/suite/funcs_1/r/processlist_val_ps.result
mysql-test/suite/funcs_1/triggers/triggers_03.inc
mysql-test/suite/funcs_1/triggers/triggers_08.inc
mysql-test/suite/funcs_1/triggers/triggers_1011ext.inc
mysql-test/suite/rpl/r/rpl_server_id1.result
mysql-test/suite/rpl/r/rpl_temporary.result
mysql-test/suite/rpl/t/disabled.def
mysql-test/suite/rpl/t/rpl_server_id1.test
mysql-test/suite/rpl/t/rpl_temporary.test
mysql-test/t/backup.test
mysql-test/t/backup_commit_blocker.test
mysql-test/t/backup_ddl_blocker.test
mysql-test/t/backup_errors.test
mysql-test/t/backup_objects.test
mysql-test/t/backup_progress.test
mysql-test/t/backup_security.test
mysql-test/t/backup_snapshot.test
mysql-test/t/character_set_server_func.test
mysql-test/t/client_xml.test
mysql-test/t/ctype_big5.test
mysql-test/t/ctype_gb2312.test
mysql-test/t/ctype_gbk.test
mysql-test/t/ctype_tis620.test
mysql-test/t/ctype_ucs.test
mysql-test/t/ctype_utf16.test
mysql-test/t/ctype_utf32.test
mysql-test/t/ctype_utf8.test
mysql-test/t/disabled.def
mysql-test/t/fulltext2.test
mysql-test/t/func_in.test
mysql-test/t/func_misc.test
mysql-test/t/innodb-autoinc.test
mysql-test/t/key_cache.test
mysql-test/t/maria-mvcc.test
mysql-test/t/maria-preload.test
mysql-test/t/maria.test
mysql-test/t/merge.test
mysql-test/t/mysql_delimiter.sql
mysql-test/t/mysqltest.test
mysql-test/t/system_mysql_db_fix50030.test
mysql-test/t/system_mysql_db_fix50117.test
mysql-test/t/xml.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/default.c
mysys/mf_iocache.c
mysys/mf_keycache.c
mysys/mf_pack.c
mysys/my_thr_init.c
mysys/my_uuid.c
mysys/thr_lock.c
scripts/make_binary_distribution.sh
scripts/mysql_system_tables.sql
sql/CMakeLists.txt
sql/Makefile.am
sql/backup/CMakeLists.txt
sql/backup/Makefile.am
sql/backup/api_types.h
sql/backup/backup_aux.h
sql/backup/backup_engine.h
sql/backup/backup_kernel.h
sql/backup/backup_progress.cc
sql/backup/backup_progress.h
sql/backup/backup_stream.h
sql/backup/backup_test.cc
sql/backup/be_default.cc
sql/backup/be_default.h
sql/backup/be_native.h
sql/backup/be_snapshot.cc
sql/backup/be_snapshot.h
sql/backup/be_thread.cc
sql/backup/be_thread.h
sql/backup/buffer_iterator.cc
sql/backup/buffer_iterator.h
sql/backup/data_backup.cc
sql/backup/kernel.cc
sql/backup/logger.cc
sql/backup/logger.h
sql/backup/stream.cc
sql/backup/stream.h
sql/backup/stream_services.h
sql/backup/stream_v1.c
sql/backup/stream_v1.h
sql/backup/stream_v1_transport.c
sql/ddl_blocker.cc
sql/ddl_blocker.h
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/events.cc
sql/field.cc
sql/filesort.cc
sql/handler.cc
sql/item.cc
sql/item_cmpfunc.cc
sql/item_func.cc
sql/item_strfunc.cc
sql/item_xmlfunc.cc
sql/lex.h
sql/lock.cc
sql/log.cc
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/opt_range.h
sql/records.cc
sql/set_var.cc
sql/set_var.h
sql/share/charsets/cp866.xml
sql/share/errmsg.txt
sql/si_objects.cc
sql/si_objects.h
sql/sp.cc
sql/sp_head.cc
sql/sql_acl.cc
sql/sql_array.h
sql/sql_base.cc
sql/sql_bitmap.h
sql/sql_cache.cc
sql/sql_class.cc
sql/sql_class.h
sql/sql_delete.cc
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_load.cc
sql/sql_parse.cc
sql/sql_partition.cc
sql/sql_plugin.cc
sql/sql_prepare.cc
sql/sql_repl.cc
sql/sql_repl.h
sql/sql_select.cc
sql/sql_servers.cc
sql/sql_string.cc
sql/sql_table.cc
sql/sql_trigger.cc
sql/sql_udf.cc
sql/sql_update.cc
sql/sql_view.cc
sql/sql_yacc.yy
storage/maria/KNOWN_BUGS.txt
storage/maria/ha_maria.cc
storage/maria/ha_maria.h
storage/maria/ma_blockrec.c
storage/maria/ma_check.c
storage/maria/ma_checkpoint.c
storage/maria/ma_close.c
storage/maria/ma_create.c
storage/maria/ma_delete.c
storage/maria/ma_key_recover.c
storage/maria/ma_locking.c
storage/maria/ma_loghandler.c
storage/maria/ma_loghandler.h
storage/maria/ma_loghandler_lsn.h
storage/maria/ma_open.c
storage/maria/ma_recovery.c
storage/maria/ma_search.c
storage/maria/ma_state.c
storage/maria/ma_state.h
storage/maria/ma_test_force_start.pl
storage/maria/ma_write.c
storage/maria/maria_chk.c
storage/maria/maria_pack.c
storage/maria/trnman.c
storage/maria/trnman_public.h
storage/maria/unittest/ma_test_recovery.pl
storage/myisam/CMakeLists.txt
storage/myisam/Makefile.am
storage/myisam/ft_parser.c
storage/myisam/ft_update.c
storage/myisam/ftdefs.h
storage/myisam/ha_myisam.cc
storage/myisam/ha_myisam.h
storage/myisam/mi_check.c
storage/myisam/mi_close.c
storage/myisam/mi_create.c
storage/myisam/mi_delete.c
storage/myisam/mi_delete_all.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_locking.c
storage/myisam/mi_log.c
storage/myisam/mi_open.c
storage/myisam/mi_page.c
storage/myisam/mi_panic.c
storage/myisam/mi_rrnd.c
storage/myisam/mi_static.c
storage/myisam/mi_test2.c
storage/myisam/mi_test3.c
storage/myisam/mi_test_all.sh
storage/myisam/mi_update.c
storage/myisam/mi_write.c
storage/myisam/myisam_ftdump.c
storage/myisam/myisamchk.c
storage/myisam/myisamdef.h
storage/myisam/myisamlog.c
storage/myisam/myisampack.c
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/myrg_info.c
storage/myisammrg/myrg_open.c
storage/myisammrg/myrg_queue.c
storage/myisammrg/myrg_rrnd.c
strings/ctype-big5.c
strings/ctype-extra.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-ucs2.c
strings/ctype-utf8.c
support-files/my-huge.cnf.sh
support-files/my-large.cnf.sh
support-files/my-medium.cnf.sh
win/configure.js
sql/backup/image_info.cc
sql/backup/image_info.h
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl 2008-07-22 12:11:06 +0000
+++ b/mysql-test/mysql-test-run.pl 2008-07-25 12:31:16 +0000
@@ -1474,13 +1474,15 @@ sub executable_setup_ndb () {
$exe_ndbd=
mtr_exe_maybe_exists("$ndb_path/src/kernel/ndbd",
- "$ndb_path/ndbd");
+ "$ndb_path/ndbd",
+ "$glob_basedir/libexec/ndbd");
$exe_ndb_mgm=
mtr_exe_maybe_exists("$ndb_path/src/mgmclient/ndb_mgm",
"$ndb_path/ndb_mgm");
$exe_ndb_mgmd=
mtr_exe_maybe_exists("$ndb_path/src/mgmsrv/ndb_mgmd",
- "$ndb_path/ndb_mgmd");
+ "$ndb_path/ndb_mgmd",
+ "$glob_basedir/libexec/ndb_mgmd");
$exe_ndb_waiter=
mtr_exe_maybe_exists("$ndb_path/tools/ndb_waiter",
"$ndb_path/ndb_waiter");
=== modified file 'sql/probes.h'
--- a/sql/probes.h 2007-09-21 07:09:31 +0000
+++ b/sql/probes.h 2008-07-08 13:49:57 +0000
@@ -11,7 +11,7 @@
extern "C" {
#endif
-#if _DTRACE_VERSION
+#if _DTRACE_VERSION && defined(HAVE_DTRACE)
#define MYSQL_DELETE_END() \
__dtrace_mysql___delete_end()
=== modified file 'storage/falcon/Makefile.am'
--- a/storage/falcon/Makefile.am 2008-07-19 03:03:39 +0000
+++ b/storage/falcon/Makefile.am 2008-07-25 12:31:16 +0000
@@ -381,7 +381,7 @@ noinst_HEADERS= $(falcon_headers) \
EXTRA_LTLIBRARIES= ha_falcon.la
pkglib_LTLIBRARIES= @plugin_falcon_shared_target@
-ha_falcon_la_LDFLAGS= -module -rpath $(pkglibdir) -lstdc++
+ha_falcon_la_LDFLAGS= -module -rpath $(pkglibdir)
ha_falcon_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_falcon_la_CFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_falcon_la_LIBADD= TransformLib/libtransform.la
=== modified file 'storage/falcon/MemMgr.cpp'
--- a/storage/falcon/MemMgr.cpp 2008-06-19 15:09:45 +0000
+++ b/storage/falcon/MemMgr.cpp 2008-07-15 16:45:57 +0000
@@ -544,6 +544,7 @@ void* MemMgr::allocateDebug(int size, co
length = ROUNDUP(size, defaultRounding) + OFFSET(MemBlock*, body) + sizeof(long);
memory = (MemBlock*) allocRaw(length);
memory->pool = NULL;
+ memory->length = length;
}
#ifdef MEM_DEBUG
| Thread |
|---|
| • bzr push into mysql-6.0-backup branch (df:2680) | Daniel Fischer | 25 Jul |
