From: Martin Skold Date: June 7 2012 11:58am Subject: bzr push into mysql-5.1-telco-7.0 branch (Martin.Skold:4933 to 4934) List-Archive: http://lists.mysql.com/commits/144143 Message-Id: <20120607115805.F10429F8D7F@quadfish> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4934 Martin Skold 2012-06-07 Regenerated result for mysqldump, default character_set and collation now uses utf8 modified: mysql-test/r/mysqldump.result 4933 Martin Skold 2012-06-07 [merge] Merge from 5.1.63 removed: mysql-test/t/cache_innodb-master.opt added: extra/yassl/certs/ca-key.pem extra/yassl/certs/client-keyEnc.pem extra/yassl/certs/client-keyEnc3.pem extra/yassl/certs/server-keyEnc.pem extra/yassl/taocrypt/certs/ extra/yassl/taocrypt/certs/client-cert.der extra/yassl/taocrypt/certs/client-key.der extra/yassl/taocrypt/certs/dh1024.dat extra/yassl/taocrypt/certs/dsa512.der extra/yassl/taocrypt/include/hc128.hpp extra/yassl/taocrypt/include/rabbit.hpp extra/yassl/taocrypt/src/hc128.cpp extra/yassl/taocrypt/src/rabbit.cpp mysql-test/r/partition_cache.result mysql-test/suite/innodb/r/innodb_bug11754376.result mysql-test/suite/innodb/r/innodb_bug11766634.result mysql-test/suite/innodb/r/innodb_bug12400341.result mysql-test/suite/innodb/r/innodb_bug13510739.result mysql-test/suite/innodb/r/innodb_bug13635833.result mysql-test/suite/innodb/t/innodb_bug11754376.test mysql-test/suite/innodb/t/innodb_bug11766634.test mysql-test/suite/innodb/t/innodb_bug12400341-master.opt mysql-test/suite/innodb/t/innodb_bug12400341.test mysql-test/suite/innodb/t/innodb_bug13510739.test mysql-test/suite/innodb/t/innodb_bug13635833.test mysql-test/suite/innodb_plugin/r/innodb-blob.result mysql-test/suite/innodb_plugin/r/innodb_bug11754376.result mysql-test/suite/innodb_plugin/r/innodb_bug11766634.result mysql-test/suite/innodb_plugin/r/innodb_bug12400341.result mysql-test/suite/innodb_plugin/r/innodb_bug13510739.result mysql-test/suite/innodb_plugin/r/innodb_bug13635833.result mysql-test/suite/innodb_plugin/t/innodb-blob.test mysql-test/suite/innodb_plugin/t/innodb_bug11754376.test mysql-test/suite/innodb_plugin/t/innodb_bug11766634.test mysql-test/suite/innodb_plugin/t/innodb_bug12400341-master.opt mysql-test/suite/innodb_plugin/t/innodb_bug12400341.test mysql-test/suite/innodb_plugin/t/innodb_bug13510739.test mysql-test/suite/innodb_plugin/t/innodb_bug13635833.test mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result mysql-test/suite/rpl/t/rpl_stm_relay_ign_space-slave.opt mysql-test/suite/rpl/t/rpl_stm_relay_ign_space.test mysql-test/t/partition_cache.test modified: README client/mysqldump.c client/mysqlslap.c client/sql_string.cc configure.in extra/yassl/CMakeLists.txt* extra/yassl/INSTALL extra/yassl/README extra/yassl/certs/ca-cert.pem extra/yassl/certs/client-cert.der extra/yassl/certs/client-cert.pem extra/yassl/certs/client-key.der extra/yassl/certs/client-key.pem extra/yassl/certs/dsa-cert.pem extra/yassl/certs/dsa512.der extra/yassl/certs/server-cert.pem extra/yassl/certs/server-key.pem extra/yassl/certs/taoCert.txt extra/yassl/examples/client/client.cpp extra/yassl/examples/echoclient/echoclient.cpp extra/yassl/examples/echoserver/echoserver.cpp extra/yassl/examples/server/server.cpp extra/yassl/include/buffer.hpp extra/yassl/include/cert_wrapper.hpp extra/yassl/include/openssl/ssl.h extra/yassl/include/socket_wrapper.hpp 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/make.bat* extra/yassl/src/socket_wrapper.cpp extra/yassl/src/ssl.cpp extra/yassl/src/yassl.cpp extra/yassl/src/yassl_error.cpp extra/yassl/src/yassl_imp.cpp extra/yassl/src/yassl_int.cpp extra/yassl/taocrypt/README extra/yassl/taocrypt/benchmark/benchmark.cpp extra/yassl/taocrypt/benchmark/benchmark.dsp extra/yassl/taocrypt/benchmark/dh1024.der extra/yassl/taocrypt/benchmark/dsa1024.der extra/yassl/taocrypt/benchmark/make.bat* extra/yassl/taocrypt/benchmark/rsa1024.der extra/yassl/taocrypt/include/asn.hpp extra/yassl/taocrypt/include/block.hpp extra/yassl/taocrypt/include/blowfish.hpp extra/yassl/taocrypt/include/des.hpp extra/yassl/taocrypt/include/file.hpp extra/yassl/taocrypt/include/hash.hpp extra/yassl/taocrypt/include/integer.hpp extra/yassl/taocrypt/include/kernelc.hpp extra/yassl/taocrypt/include/misc.hpp extra/yassl/taocrypt/include/modes.hpp extra/yassl/taocrypt/include/pwdbased.hpp extra/yassl/taocrypt/include/rsa.hpp extra/yassl/taocrypt/include/runtime.hpp extra/yassl/taocrypt/include/types.hpp extra/yassl/taocrypt/mySTL/stdexcept.hpp extra/yassl/taocrypt/mySTL/vector.hpp extra/yassl/taocrypt/src/Makefile.am extra/yassl/taocrypt/src/aes.cpp extra/yassl/taocrypt/src/aestables.cpp extra/yassl/taocrypt/src/algebra.cpp extra/yassl/taocrypt/src/arc4.cpp extra/yassl/taocrypt/src/asn.cpp extra/yassl/taocrypt/src/blowfish.cpp extra/yassl/taocrypt/src/coding.cpp extra/yassl/taocrypt/src/dsa.cpp extra/yassl/taocrypt/src/hash.cpp extra/yassl/taocrypt/src/integer.cpp extra/yassl/taocrypt/src/make.bat* extra/yassl/taocrypt/src/md4.cpp extra/yassl/taocrypt/src/md5.cpp extra/yassl/taocrypt/src/misc.cpp extra/yassl/taocrypt/src/random.cpp extra/yassl/taocrypt/src/ripemd.cpp extra/yassl/taocrypt/src/rsa.cpp extra/yassl/taocrypt/src/sha.cpp extra/yassl/taocrypt/src/template_instnt.cpp extra/yassl/taocrypt/src/twofish.cpp extra/yassl/taocrypt/taocrypt.dsp extra/yassl/taocrypt/test/make.bat* extra/yassl/taocrypt/test/memory.cpp extra/yassl/taocrypt/test/test.cpp extra/yassl/testsuite/make.bat* extra/yassl/testsuite/test.hpp extra/yassl/testsuite/testsuite.cpp include/decimal.h include/m_ctype.h include/m_string.h include/my_base.h include/violite.h libmysqld/CMakeLists.txt libmysqld/lib_sql.cc mysql-test/extra/rpl_tests/rpl_extra_col_master.test mysql-test/include/mtr_check.sql mysql-test/include/query_cache.inc mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl mysql-test/r/cache_innodb.result mysql-test/r/cast.result mysql-test/r/ctype_utf8.result mysql-test/r/errors.result mysql-test/r/func_in.result mysql-test/r/func_time.result mysql-test/r/gis.result mysql-test/r/init_connect.result mysql-test/r/join_outer.result mysql-test/r/myisam.result mysql-test/r/mysqldump.result mysql-test/r/mysqlslap.result mysql-test/r/partition.result mysql-test/r/range.result mysql-test/r/sp-bugs.result mysql-test/r/sp-code.result mysql-test/r/sp.result mysql-test/r/sp_notembedded.result mysql-test/r/sql_mode.result mysql-test/r/subselect.result mysql-test/r/subselect_innodb.result mysql-test/suite/binlog/r/binlog_sql_mode.result mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result mysql-test/suite/binlog/t/binlog_sql_mode.test mysql-test/suite/binlog/t/binlog_stm_unsafe_warning.test mysql-test/suite/engines/funcs/r/db_alter_collate_ascii.result mysql-test/suite/engines/funcs/r/db_alter_collate_utf8.result mysql-test/suite/federated/federated_server.result mysql-test/suite/federated/federated_server.test mysql-test/suite/innodb/t/innodb_bug34300.test mysql-test/suite/innodb/t/innodb_bug53756.test mysql-test/suite/innodb_plugin/r/innodb-index.result mysql-test/suite/innodb_plugin/t/innodb-index.test mysql-test/suite/innodb_plugin/t/innodb_bug34300.test mysql-test/suite/innodb_plugin/t/innodb_bug53756.test mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result mysql-test/suite/rpl/t/rpl_extra_col_master_innodb.test mysql-test/suite/rpl/t/rpl_extra_col_master_myisam.test mysql-test/t/cast.test mysql-test/t/ctype_utf8.test mysql-test/t/errors.test mysql-test/t/func_in.test mysql-test/t/func_time.test mysql-test/t/gis.test mysql-test/t/init_connect.test mysql-test/t/join_outer.test mysql-test/t/myisam.test mysql-test/t/mysqldump.test mysql-test/t/mysqlslap.test mysql-test/t/partition.test mysql-test/t/range.test mysql-test/t/sp-bugs.test mysql-test/t/sp-code.test mysql-test/t/sp.test mysql-test/t/sp_notembedded.test mysql-test/t/sql_mode.test mysql-test/t/subselect.test mysql-test/t/subselect_innodb.test mysys/charset-def.c mysys/my_handler_errors.h mysys/my_symlink.c mysys/stacktrace.c scripts/mysql_install_db.pl.in scripts/mysql_install_db.sh sql-common/my_time.c sql/CMakeLists.txt sql/field_conv.cc sql/filesort.cc sql/ha_ndbcluster.cc sql/ha_ndbcluster.h sql/ha_partition.h sql/handler.cc sql/handler.h sql/item.cc sql/item.h sql/item_cmpfunc.h sql/item_subselect.cc sql/item_subselect.h sql/item_timefunc.cc sql/log.cc sql/log_event.cc sql/my_decimal.h sql/mysql_priv.h sql/mysqld.cc sql/password.c sql/protocol.cc sql/rpl_rli.h sql/signal_handler.cc sql/slave.cc sql/sp_head.cc sql/sp_head.h sql/spatial.cc sql/sql_cache.cc sql/sql_class.cc sql/sql_connect.cc sql/sql_lex.cc sql/sql_lex.h sql/sql_parse.cc sql/sql_prepare.cc sql/sql_select.cc sql/sql_show.cc sql/sql_table.cc sql/sql_yacc.yy sql/table.cc sql/table.h sql/unireg.h storage/archive/ha_archive.cc storage/federated/Makefile.am storage/federated/ha_federated.cc storage/heap/hp_create.c storage/heap/hp_info.c storage/innobase/btr/btr0cur.c storage/innobase/btr/btr0pcur.c storage/innobase/buf/buf0buf.c storage/innobase/dict/dict0dict.c storage/innobase/fil/fil0fil.c storage/innobase/fsp/fsp0fsp.c storage/innobase/handler/ha_innodb.cc storage/innobase/ibuf/ibuf0ibuf.c storage/innobase/include/db0err.h storage/innobase/include/mem0mem.ic storage/innobase/include/os0proc.h storage/innobase/include/trx0purge.h storage/innobase/include/trx0rseg.ic storage/innobase/include/trx0sys.h storage/innobase/include/univ.i storage/innobase/include/ut0mem.h storage/innobase/include/ut0rnd.ic storage/innobase/mem/mem0pool.c storage/innobase/os/os0proc.c storage/innobase/row/row0ins.c storage/innobase/row/row0mysql.c storage/innobase/row/row0sel.c storage/innobase/row/row0upd.c storage/innobase/trx/trx0purge.c storage/innobase/trx/trx0sys.c storage/innobase/ut/ut0mem.c storage/innodb_plugin/ChangeLog storage/innodb_plugin/btr/btr0btr.c storage/innodb_plugin/btr/btr0cur.c storage/innodb_plugin/btr/btr0pcur.c storage/innodb_plugin/buf/buf0buf.c storage/innodb_plugin/dict/dict0dict.c storage/innodb_plugin/fil/fil0fil.c storage/innodb_plugin/fsp/fsp0fsp.c storage/innodb_plugin/handler/ha_innodb.cc storage/innodb_plugin/handler/handler0alter.cc storage/innodb_plugin/ibuf/ibuf0ibuf.c storage/innodb_plugin/include/btr0btr.h storage/innodb_plugin/include/btr0cur.h storage/innodb_plugin/include/btr0cur.ic storage/innodb_plugin/include/buf0buf.h storage/innodb_plugin/include/buf0buf.ic storage/innodb_plugin/include/db0err.h storage/innodb_plugin/include/dict0dict.h storage/innodb_plugin/include/dict0dict.ic storage/innodb_plugin/include/dict0mem.h storage/innodb_plugin/include/fil0fil.h storage/innodb_plugin/include/fsp0fsp.h storage/innodb_plugin/include/log0log.h storage/innodb_plugin/include/mem0mem.ic storage/innodb_plugin/include/mtr0mtr.h storage/innodb_plugin/include/mtr0mtr.ic storage/innodb_plugin/include/page0page.h storage/innodb_plugin/include/page0page.ic storage/innodb_plugin/include/sync0rw.ic storage/innodb_plugin/include/trx0purge.h storage/innodb_plugin/include/trx0rec.ic storage/innodb_plugin/include/trx0rseg.ic storage/innodb_plugin/include/trx0sys.h storage/innodb_plugin/include/trx0undo.h storage/innodb_plugin/include/univ.i storage/innodb_plugin/include/ut0mem.h storage/innodb_plugin/include/ut0rnd.ic storage/innodb_plugin/lock/lock0lock.c storage/innodb_plugin/log/log0log.c storage/innodb_plugin/mem/mem0pool.c storage/innodb_plugin/mtr/mtr0mtr.c storage/innodb_plugin/os/os0proc.c storage/innodb_plugin/page/page0cur.c storage/innodb_plugin/page/page0page.c storage/innodb_plugin/row/row0ins.c storage/innodb_plugin/row/row0merge.c storage/innodb_plugin/row/row0mysql.c storage/innodb_plugin/row/row0row.c storage/innodb_plugin/row/row0sel.c storage/innodb_plugin/row/row0upd.c storage/innodb_plugin/trx/trx0purge.c storage/innodb_plugin/trx/trx0rec.c storage/innodb_plugin/trx/trx0sys.c storage/innodb_plugin/trx/trx0trx.c storage/innodb_plugin/trx/trx0undo.c storage/innodb_plugin/ut/ut0mem.c storage/myisam/ft_boolean_search.c storage/myisam/ft_nlq_search.c storage/myisam/mi_check.c storage/myisam/mi_close.c storage/myisam/mi_delete_all.c storage/myisam/mi_packrec.c storage/myisam/mi_preload.c strings/ctype-ucs2.c strings/ctype-utf8.c strings/decimal.c unittest/mysys/bitmap-t.c vio/viosocket.c === modified file 'mysql-test/r/mysqldump.result' --- a/mysql-test/r/mysqldump.result 2012-06-07 09:06:47 +0000 +++ b/mysql-test/r/mysqldump.result 2012-06-07 11:57:33 +0000 @@ -5094,9 +5094,9 @@ USE `test`; /*!50003 SET @saved_cs_client = @@character_set_client */ ; /*!50003 SET @saved_cs_results = @@character_set_results */ ; /*!50003 SET @saved_col_connection = @@collation_connection */ ; -/*!50003 SET character_set_client = latin1 */ ; -/*!50003 SET character_set_results = latin1 */ ; -/*!50003 SET collation_connection = latin1_swedish_ci */ ; +/*!50003 SET character_set_client = utf8 */ ; +/*!50003 SET character_set_results = utf8 */ ; +/*!50003 SET collation_connection = utf8_general_ci */ ; /*!50003 SET @saved_sql_mode = @@sql_mode */ ; /*!50003 SET sql_mode = '' */ ; /*!50032 DROP TRIGGER IF EXISTS tt1_t1 */; No bundle (reason: useless for push emails).