3005 Bjorn Munch 2011-07-04 [merge]
merge from 5.1 main
modified:
BUILD/FINISH.sh
BUILD/SETUP.sh
BUILD/check-cpu
BUILD/compile-dist
BUILD/compile-pentium-icc-valgrind-max
BUILD/compile-pentium-mysqlfs-debug
BUILD/compile-pentium-valgrind-max
BUILD/compile-pentium64-valgrind-max
BUILD/compile-solaris-amd64-forte
BUILD/compile-solaris-amd64-forte-debug
BUILD/compile-solaris-sparc
BUILD/compile-solaris-sparc-forte
CMakeLists.txt
client/CMakeLists.txt
client/Makefile.am
client/client_priv.h
client/my_readline.h
client/mysql.cc
client/mysql_upgrade.c
client/mysqladmin.cc
client/mysqlbinlog.cc
client/mysqlcheck.c
client/mysqldump.c
client/mysqlimport.c
client/mysqlshow.c
client/mysqlslap.c
client/mysqltest.cc
client/readline.cc
client/sql_string.cc
client/sql_string.h
extra/comp_err.c
extra/innochecksum.c
extra/my_print_defaults.c
extra/mysql_waitpid.c
extra/perror.c
extra/replace.c
extra/resolve_stack_dump.c
extra/resolveip.c
extra/yassl/include/cert_wrapper.hpp
extra/yassl/include/openssl/prefix_ssl.h
extra/yassl/include/openssl/ssl.h
extra/yassl/include/yassl_error.hpp
extra/yassl/include/yassl_imp.hpp
extra/yassl/include/yassl_int.hpp
extra/yassl/include/yassl_types.hpp
extra/yassl/src/buffer.cpp
extra/yassl/src/cert_wrapper.cpp
extra/yassl/src/crypto_wrapper.cpp
extra/yassl/src/handshake.cpp
extra/yassl/src/ssl.cpp
extra/yassl/src/yassl_error.cpp
extra/yassl/src/yassl_imp.cpp
extra/yassl/src/yassl_int.cpp
extra/yassl/taocrypt/include/asn.hpp
extra/yassl/taocrypt/include/block.hpp
extra/yassl/taocrypt/include/blowfish.hpp
extra/yassl/taocrypt/include/modes.hpp
extra/yassl/taocrypt/include/runtime.hpp
extra/yassl/taocrypt/src/aes.cpp
extra/yassl/taocrypt/src/algebra.cpp
extra/yassl/taocrypt/src/asn.cpp
extra/yassl/taocrypt/src/blowfish.cpp
extra/yassl/taocrypt/src/coding.cpp
extra/yassl/taocrypt/src/integer.cpp
extra/yassl/taocrypt/src/misc.cpp
extra/yassl/taocrypt/src/random.cpp
extra/yassl/taocrypt/src/twofish.cpp
extra/yassl/testsuite/test.hpp
include/Makefile.am
include/config-netware.h
include/config-win.h
include/hash.h
include/heap.h
include/keycache.h
include/m_ctype.h
include/m_string.h
include/my_alarm.h
include/my_base.h
include/my_bit.h
include/my_bitmap.h
include/my_dbug.h
include/my_getopt.h
include/my_global.h
include/my_no_pthread.h
include/my_stacktrace.h
include/my_time.h
include/myisam.h
include/myisammrg.h
include/mysql.h
include/mysql/plugin.h
include/mysql_embed.h
include/mysys_err.h
include/sslopt-longopts.h
include/thr_lock.h
include/violite.h
libmysql/CMakeLists.txt
libmysql/Makefile.am
libmysql/Makefile.shared
libmysql/libmysql.c
libmysql/manager.c
libmysqld/CMakeLists.txt
libmysqld/Makefile.am
libmysqld/emb_qcache.h
libmysqld/examples/CMakeLists.txt
libmysqld/examples/Makefile.am
libmysqld/examples/builder-sample/emb_sample.bpr
libmysqld/examples/builder-sample/emb_sample.cpp
libmysqld/examples/builder-sample/emb_samples.cpp
libmysqld/examples/builder-sample/emb_samples.h
libmysqld/libmysqld.c
man/Makefile.am
mysql-test/Makefile.am
mysql-test/include/default_my.cnf
mysql-test/include/default_mysqld.cnf
mysql-test/include/mtr_check.sql
mysql-test/include/mtr_warnings.sql
mysql-test/include/set_binlog_format_mixed.sql
mysql-test/include/set_binlog_format_row.sql
mysql-test/include/set_binlog_format_statement.sql
mysql-test/lib/My/Config.pm
mysql-test/lib/My/ConfigFactory.pm
mysql-test/lib/My/CoreDump.pm
mysql-test/lib/My/File/Path.pm
mysql-test/lib/My/Find.pm
mysql-test/lib/My/Handles.pm
mysql-test/lib/My/Platform.pm
mysql-test/lib/My/SafeProcess.pm
mysql-test/lib/My/SafeProcess/Base.pm
mysql-test/lib/My/SafeProcess/Makefile.am
mysql-test/lib/My/SafeProcess/safe_kill_win.cc
mysql-test/lib/My/SafeProcess/safe_process.cc
mysql-test/lib/My/SafeProcess/safe_process.pl
mysql-test/lib/My/SafeProcess/safe_process_win.cc
mysql-test/lib/My/SysInfo.pm
mysql-test/lib/My/Test.pm
mysql-test/lib/mtr_gcov.pl
mysql-test/lib/mtr_gprof.pl
mysql-test/lib/mtr_io.pl
mysql-test/lib/mtr_stress.pl
mysql-test/lib/mtr_unique.pm
mysql-test/lib/t/Base.t
mysql-test/lib/t/Find.t
mysql-test/lib/t/Options.t
mysql-test/lib/t/Platform.t
mysql-test/lib/t/SafeProcess.t
mysql-test/lib/t/SafeProcessStress.pl
mysql-test/lib/t/copytree.t
mysql-test/lib/t/dummyd.pl
mysql-test/lib/t/rmtree.t
mysql-test/lib/t/testMyConfig.t
mysql-test/lib/t/testMyConfigFactory.t
mysql-test/lib/t/test_child.pl
mysql-test/lib/v1/My/Config.pm
mysql-test/lib/v1/mtr_cases.pl
mysql-test/lib/v1/mtr_gcov.pl
mysql-test/lib/v1/mtr_gprof.pl
mysql-test/lib/v1/mtr_im.pl
mysql-test/lib/v1/mtr_io.pl
mysql-test/lib/v1/mtr_match.pl
mysql-test/lib/v1/mtr_misc.pl
mysql-test/lib/v1/mtr_process.pl
mysql-test/lib/v1/mtr_report.pl
mysql-test/lib/v1/mtr_stress.pl
mysql-test/lib/v1/mtr_timer.pl
mysql-test/lib/v1/mtr_unique.pl
mysql-test/lib/v1/mysql-test-run.pl
mysql-test/std_data/latin1.xml
mysql-test/suite/innodb_plugin/r/innodb-index.result
mysql-test/suite/innodb_plugin/t/innodb-index.test
mysql-test/t/parser_stack.test
mysql-test/valgrind.supp
mysys/CMakeLists.txt
mysys/Makefile.am
mysys/array.c
mysys/base64.c
mysys/charset.c
mysys/default.c
mysys/errors.c
mysys/hash.c
mysys/mf_format.c
mysys/mf_getdate.c
mysys/mf_iocache.c
mysys/mf_iocache2.c
mysys/mf_keycache.c
mysys/mf_loadpath.c
mysys/mf_tempdir.c
mysys/mf_wfile.c
mysys/my_alloc.c
mysys/my_bitmap.c
mysys/my_compare.c
mysys/my_copy.c
mysys/my_error.c
mysys/my_file.c
mysys/my_fstream.c
mysys/my_gethwaddr.c
mysys/my_getncpus.c
mysys/my_getopt.c
mysys/my_getwd.c
mysys/my_handler_errors.h
mysys/my_init.c
mysys/my_largepage.c
mysys/my_malloc.c
mysys/my_net.c
mysys/my_new.cc
mysys/my_pread.c
mysys/my_redel.c
mysys/my_seek.c
mysys/my_static.c
mysys/my_symlink.c
mysys/my_sync.c
mysys/my_thr_init.c
mysys/my_wincond.c
mysys/my_winthread.c
mysys/my_write.c
mysys/safemalloc.c
mysys/stacktrace.c
mysys/string.c
mysys/thr_alarm.c
mysys/thr_lock.c
mysys/thr_mutex.c
mysys/typelib.c
plugin/Makefile.am
plugin/daemon_example/Makefile.am
plugin/fulltext/plugin_example.c
regex/CMakeLists.txt
scripts/Makefile.am
scripts/make_win_bin_dist
scripts/mysql_config.pl.in
scripts/mysql_config.sh
scripts/mysql_convert_table_format.sh
scripts/mysql_find_rows.sh
scripts/mysql_fix_extensions.sh
scripts/mysql_install_db.sh
scripts/mysql_secure_installation.pl.in
scripts/mysql_secure_installation.sh
scripts/mysql_setpermission.sh
scripts/mysql_system_tables.sql
scripts/mysql_system_tables_data.sql
scripts/mysql_system_tables_fix.sql
scripts/mysql_zap.sh
scripts/mysqlaccess.sh
scripts/mysqld_multi.sh
scripts/mysqldumpslow.sh
scripts/mysqlhotcopy.sh
server-tools/instance-manager/buffer.cc
server-tools/instance-manager/commands.cc
server-tools/instance-manager/instance.cc
server-tools/instance-manager/instance_map.cc
server-tools/instance-manager/instance_options.cc
server-tools/instance-manager/listener.cc
server-tools/instance-manager/mysql_connection.cc
server-tools/instance-manager/options.cc
server-tools/instance-manager/options.h
server-tools/instance-manager/parse.cc
server-tools/instance-manager/parse.h
server-tools/instance-manager/parse_output.cc
server-tools/instance-manager/protocol.cc
server-tools/instance-manager/user_map.cc
sql-bench/as3ap.sh
sql-bench/bench-count-distinct.sh
sql-bench/bench-init.pl.sh
sql-bench/compare-results.sh
sql-bench/copy-db.sh
sql-bench/crash-me.sh
sql-bench/run-all-tests.sh
sql-bench/server-cfg.sh
sql-bench/test-ATIS.sh
sql-bench/test-alter-table.sh
sql-bench/test-big-tables.sh
sql-bench/test-connect.sh
sql-bench/test-create.sh
sql-bench/test-insert.sh
sql-bench/test-select.sh
sql-bench/test-transactions.sh
sql-bench/test-wisconsin.sh
sql-common/client.c
sql-common/my_time.c
sql-common/my_user.c
sql/CMakeLists.txt
sql/Makefile.am
sql/authors.h
sql/client_settings.h
sql/debug_sync.cc
sql/debug_sync.h
sql/event_data_objects.cc
sql/event_db_repository.cc
sql/event_db_repository.h
sql/event_parse_data.cc
sql/event_parse_data.h
sql/event_scheduler.cc
sql/events.cc
sql/field.cc
sql/field.h
sql/field_conv.cc
sql/filesort.cc
sql/gen_lex_hash.cc
sql/gstream.cc
sql/ha_ndbcluster.cc
sql/ha_ndbcluster_binlog.cc
sql/ha_partition.cc
sql/ha_partition.h
sql/handler.h
sql/item.cc
sql/item_buff.cc
sql/item_create.cc
sql/item_create.h
sql/item_func.h
sql/item_geofunc.cc
sql/item_row.cc
sql/item_row.h
sql/item_strfunc.cc
sql/item_strfunc.h
sql/item_subselect.h
sql/item_sum.cc
sql/item_sum.h
sql/item_timefunc.cc
sql/item_timefunc.h
sql/item_xmlfunc.cc
sql/key.cc
sql/lex.h
sql/lock.cc
sql/log.h
sql/log_event.cc
sql/log_event.h
sql/log_event_old.cc
sql/message.h
sql/my_decimal.cc
sql/my_decimal.h
sql/mysql_priv.h
sql/mysqld.cc
sql/opt_range.cc
sql/opt_range.h
sql/opt_sum.cc
sql/parse_file.cc
sql/parse_file.h
sql/partition_info.cc
sql/partition_info.h
sql/password.c
sql/protocol.cc
sql/protocol.h
sql/records.cc
sql/repl_failsafe.cc
sql/rpl_constants.h
sql/rpl_filter.cc
sql/rpl_injector.cc
sql/rpl_mi.cc
sql/rpl_mi.h
sql/rpl_record.cc
sql/rpl_record.h
sql/rpl_record_old.cc
sql/rpl_reporting.cc
sql/rpl_reporting.h
sql/rpl_rli.cc
sql/rpl_rli.h
sql/rpl_tblmap.cc
sql/rpl_utility.cc
sql/rpl_utility.h
sql/set_var.cc
sql/share/Makefile.am
sql/share/charsets/cp1251.xml
sql/slave.cc
sql/slave.h
sql/sp.cc
sql/sp.h
sql/sp_cache.cc
sql/sp_head.cc
sql/sp_head.h
sql/sp_pcontext.cc
sql/sp_pcontext.h
sql/sp_rcontext.cc
sql/spatial.cc
sql/spatial.h
sql/sql_acl.h
sql/sql_analyse.cc
sql/sql_binlog.cc
sql/sql_cache.cc
sql/sql_cache.h
sql/sql_class.cc
sql/sql_class.h
sql/sql_connect.cc
sql/sql_crypt.cc
sql/sql_crypt.h
sql/sql_cursor.cc
sql/sql_db.cc
sql/sql_delete.cc
sql/sql_derived.cc
sql/sql_error.cc
sql/sql_handler.cc
sql/sql_help.cc
sql/sql_insert.cc
sql/sql_lex.cc
sql/sql_lex.h
sql/sql_list.h
sql/sql_load.cc
sql/sql_locale.cc
sql/sql_manager.cc
sql/sql_olap.cc
sql/sql_parse.cc
sql/sql_partition.h
sql/sql_plugin.cc
sql/sql_plugin.h
sql/sql_profile.cc
sql/sql_profile.h
sql/sql_rename.cc
sql/sql_repl.cc
sql/sql_select.h
sql/sql_servers.cc
sql/sql_show.h
sql/sql_string.cc
sql/sql_string.h
sql/sql_table.cc
sql/sql_tablespace.cc
sql/sql_test.cc
sql/sql_trigger.cc
sql/sql_trigger.h
sql/sql_udf.cc
sql/sql_union.cc
sql/sql_view.h
sql/sql_yacc.yy
sql/strfunc.cc
sql/structs.h
sql/table.cc
sql/thr_malloc.cc
sql/time.cc
sql/tztime.cc
sql/tztime.h
sql/udf_example.c
sql/uniques.cc
sql/unireg.cc
sql/unireg.h
storage/Makefile.am
storage/archive/CMakeLists.txt
storage/archive/Makefile.am
storage/archive/archive_reader.c
storage/archive/ha_archive.cc
storage/blackhole/CMakeLists.txt
storage/blackhole/Makefile.am
storage/blackhole/ha_blackhole.cc
storage/blackhole/ha_blackhole.h
storage/csv/CMakeLists.txt
storage/csv/Makefile.am
storage/csv/ha_tina.cc
storage/csv/ha_tina.h
storage/csv/transparent_file.cc
storage/csv/transparent_file.h
storage/example/CMakeLists.txt
storage/example/Makefile.am
storage/example/ha_example.cc
storage/example/ha_example.h
storage/federated/CMakeLists.txt
storage/federated/Makefile.am
storage/federated/ha_federated.cc
storage/federated/ha_federated.h
storage/heap/CMakeLists.txt
storage/heap/ha_heap.cc
storage/heap/ha_heap.h
storage/heap/hp_hash.c
storage/heap/hp_test2.c
storage/heap/hp_write.c
storage/innodb_plugin/ChangeLog
storage/innodb_plugin/include/trx0sys.h
storage/innodb_plugin/row/row0row.c
storage/myisam/CMakeLists.txt
storage/myisam/ft_boolean_search.c
storage/myisam/ft_nlq_search.c
storage/myisam/ft_parser.c
storage/myisam/ft_stopwords.c
storage/myisam/ftdefs.h
storage/myisam/fulltext.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_dbug.c
storage/myisam/mi_delete.c
storage/myisam/mi_delete_all.c
storage/myisam/mi_delete_table.c
storage/myisam/mi_dynrec.c
storage/myisam/mi_extra.c
storage/myisam/mi_locking.c
storage/myisam/mi_open.c
storage/myisam/mi_packrec.c
storage/myisam/mi_page.c
storage/myisam/mi_preload.c
storage/myisam/mi_range.c
storage/myisam/mi_rnext.c
storage/myisam/mi_search.c
storage/myisam/mi_static.c
storage/myisam/mi_test1.c
storage/myisam/mi_test2.c
storage/myisam/mi_unique.c
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/myisam/rt_split.c
storage/myisam/sort.c
storage/myisam/sp_test.c
storage/myisammrg/CMakeLists.txt
storage/myisammrg/ha_myisammrg.cc
storage/myisammrg/ha_myisammrg.h
storage/myisammrg/myrg_create.c
storage/myisammrg/myrg_info.c
storage/myisammrg/myrg_open.c
storage/myisammrg/myrg_rkey.c
storage/mysql_storage_engine.cmake
storage/ndb/MAINTAINERS
storage/ndb/config/win-lib.am
storage/ndb/config/win-prg.am
storage/ndb/include/mgmapi/ndb_logevent.h
storage/ndb/include/ndbapi/NdbEventOperation.hpp
storage/ndb/include/ndbapi/NdbOperation.hpp
storage/ndb/src/common/portlib/NdbMutex.c
storage/ndb/src/common/util/Makefile.am
storage/ndb/src/kernel/blocks/backup/read.cpp
storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
storage/ndb/src/kernel/blocks/lgman.cpp
storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
storage/ndb/src/kernel/blocks/suma/Suma.cpp
storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
storage/ndb/src/mgmsrv/Makefile.am
storage/ndb/src/ndbapi/DictCache.cpp
storage/ndb/src/ndbapi/NdbEventOperation.cpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
storage/ndb/test/run-test/Makefile.am
storage/ndb/test/run-test/atrt.hpp
storage/ndb/test/run-test/autotest-boot.sh
storage/ndb/test/run-test/autotest-run.sh
storage/ndb/test/run-test/files.cpp
storage/ndb/test/run-test/setup.cpp
storage/ndb/test/run-test/upgrade-boot.sh
storage/ndb/test/sql/BANK.sql
storage/ndb/test/sql/T1.sql
storage/ndb/test/tools/connect.cpp
storage/ndb/test/tools/log_listner.cpp
storage/ndb/tools/restore/consumer_restore.cpp
storage/ndb/tools/restore/consumer_restorem.cpp
strings/CMakeLists.txt
strings/Makefile.am
strings/bchange.c
strings/bcopy-duff.c
strings/bfill.c
strings/bmove.c
strings/bmove512.c
strings/bmove_upp.c
strings/conf_to_src.c
strings/ctype-big5.c
strings/ctype-bin.c
strings/ctype-cp932.c
strings/ctype-czech.c
strings/ctype-euc_kr.c
strings/ctype-eucjpms.c
strings/ctype-extra.c
strings/ctype-gb2312.c
strings/ctype-gbk.c
strings/ctype-latin1.c
strings/ctype-mb.c
strings/ctype-simple.c
strings/ctype-sjis.c
strings/ctype-tis620.c
strings/ctype-uca.c
strings/ctype-ucs2.c
strings/ctype-ujis.c
strings/ctype-utf8.c
strings/ctype-win1250ch.c
strings/ctype.c
strings/decimal.c
strings/do_ctype.c
strings/dump_map.c
strings/int2str.c
strings/is_prefix.c
strings/llstr.c
strings/longlong2str.c
strings/longlong2str_asm.c
strings/memcmp.c
strings/memcpy.c
strings/memset.c
strings/my_strchr.c
strings/my_strtoll10.c
strings/my_vsnprintf.c
strings/r_strinstr.c
strings/str2int.c
strings/str_alloc.c
strings/str_test.c
strings/strappend.c
strings/strcat.c
strings/strcend.c
strings/strchr.c
strings/strcmp.c
strings/strcont.c
strings/strend.c
strings/strfill.c
strings/strinstr.c
strings/strlen.c
strings/strmake.c
strings/strmov.c
strings/strnlen.c
strings/strnmov.c
strings/strrchr.c
strings/strstr.c
strings/strto.c
strings/strtod.c
strings/strtol.c
strings/strtoll.c
strings/strtoul.c
strings/strtoull.c
strings/strxmov.c
strings/strxnmov.c
strings/uca-dump.c
strings/uctypedump.c
strings/udiv.c
strings/utr11-dump.c
strings/xml.c
support-files/Makefile.am
support-files/config.huge.ini.sh
support-files/config.medium.ini.sh
support-files/config.small.ini.sh
support-files/mysql.spec.sh
support-files/ndb-config-2-node.ini.sh
tests/Makefile.am
tests/bug25714.c
tests/grant.pl
tests/mysql_client_test.c
unittest/Makefile.am
unittest/examples/Makefile.am
unittest/examples/skip-t.c
unittest/examples/skip_all-t.c
unittest/examples/todo-t.c
unittest/mysys/Makefile.am
unittest/mysys/base64-t.c
unittest/mysys/bitmap-t.c
unittest/mytap/t/basic-t.c
unittest/strings/Makefile.am
unittest/strings/strings-t.c
vio/vio.c
vio/vio_priv.h
vio/viosocket.c
vio/viosslfactories.c
vio/viotest-sslconnect.cc
vio/viotest.cc
win/Makefile.am
win/build-vs10.bat
win/build-vs10_x64.bat
win/configure.js
win/create_def_file.js
3004 Bjorn Munch 2011-07-01
Bug #11757091 49093: 5.1 CONFIGURE SCRIPT SHOULD WARN ABOUT MYSQL CLUSTER NOT BEING MAINTAINED
Added a conditional echo at end of configure.in
modified:
configure.in
Diff too large for email (13242 lines, the limit is 10000).
No bundle (reason: useless for push emails).
| Thread |
|---|
| • bzr push into mysql-5.1-mtr branch (bjorn.munch:3004 to 3005) | Bjorn Munch | 4 Jul |