From: Tor Didriksen Date: December 2 2010 7:22am Subject: bzr push into mysql-5.1-bugteam branch (tor.didriksen:3509 to 3510) Bug#58246 List-Archive: http://lists.mysql.com/commits/125747 X-Bug: 58246 Message-Id: <20101202072213.2CAD01646@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3510 Tor Didriksen 2010-12-02 BUG#58246 post-push fix broken DBG build. modified: sql/sql_plugin.cc 3509 Mats Kindahl 2010-12-01 [merge] Merging patch for BUG#58246 with mysql-5.1-bugteam. removed: EXCEPTIONS-CLIENT mysql-test/suite/innodb_plugin/r/innodb_bug54679.result mysql-test/suite/innodb_plugin/r/innodb_bug56632.result mysql-test/suite/innodb_plugin/t/innodb_bug54679.test mysql-test/suite/innodb_plugin/t/innodb_bug56632.test added: mysql-test/include/ctype_8bit.inc mysql-test/suite/federated/federated_bug_35333.result mysql-test/suite/federated/federated_bug_35333.test mysql-test/suite/innodb_plugin/r/innodb-create-options.result mysql-test/suite/innodb_plugin/r/innodb_bug53046.result mysql-test/suite/innodb_plugin/r/innodb_bug56947.result mysql-test/suite/innodb_plugin/t/innodb-create-options.test mysql-test/suite/innodb_plugin/t/innodb_bug53046.test mysql-test/suite/innodb_plugin/t/innodb_bug56947.test modified: CMakeLists.txt Makefile.am README client/mysql.cc client/mysqltest.cc configure.in include/m_string.h include/my_stacktrace.h libmysql/Makefile.am libmysql/Makefile.shared libmysql/conf_to_src.c libmysql/dll.c libmysql/errmsg.c libmysql/get_password.c libmysql/libmysql.c libmysql/manager.c libmysql_r/Makefile.am mysql-test/extra/binlog_tests/binlog.test mysql-test/extra/rpl_tests/rpl_get_master_version_and_clock.test mysql-test/include/restart_mysqld.inc mysql-test/lib/mtr_cases.pm mysql-test/mysql-test-run.pl mysql-test/r/change_user.result mysql-test/r/connect.result mysql-test/r/ctype_cp1251.result mysql-test/r/ctype_utf8.result mysql-test/r/explain.result mysql-test/r/fulltext.result mysql-test/r/func_gconcat.result mysql-test/r/func_math.result mysql-test/r/func_misc.result mysql-test/r/group_by.result mysql-test/r/join_outer.result mysql-test/r/key_cache.result mysql-test/r/merge.result mysql-test/r/mysql.result mysql-test/r/mysqltest.result mysql-test/r/partition_innodb.result mysql-test/r/show_check.result mysql-test/r/user_var.result mysql-test/r/variables.result mysql-test/r/view.result mysql-test/r/xml.result mysql-test/suite/binlog/r/binlog_row_binlog.result mysql-test/suite/binlog/r/binlog_stm_binlog.result mysql-test/suite/innodb/r/innodb_mysql.result mysql-test/suite/innodb/t/innodb_mysql.test mysql-test/suite/innodb_plugin/r/innodb-zip.result mysql-test/suite/innodb_plugin/r/innodb_mysql.result mysql-test/suite/innodb_plugin/t/innodb-zip.test mysql-test/suite/innodb_plugin/t/innodb_mysql.test mysql-test/suite/rpl/t/rpl_trigger.test mysql-test/t/change_user.test mysql-test/t/connect.test mysql-test/t/ctype_cp1251.test mysql-test/t/ctype_utf8.test mysql-test/t/explain.test mysql-test/t/fulltext.test mysql-test/t/func_gconcat.test mysql-test/t/func_math.test mysql-test/t/func_misc.test mysql-test/t/group_by.test mysql-test/t/join_outer.test mysql-test/t/key_cache.test mysql-test/t/mysql.test mysql-test/t/mysqltest.test mysql-test/t/partition_innodb.test mysql-test/t/user_var.test mysql-test/t/variables.test mysql-test/t/xml.test mysys/my_symlink.c mysys/stacktrace.c scripts/make_binary_distribution.sh scripts/make_win_bin_dist sql/field_conv.cc sql/ha_partition.cc sql/item.cc sql/item_func.cc sql/item_func.h sql/item_strfunc.cc sql/item_subselect.cc sql/item_sum.cc sql/log.cc sql/mysqld.cc sql/opt_range.h sql/records.cc sql/set_var.cc sql/set_var.h sql/share/charsets/cp1251.xml sql/sql_binlog.cc sql/sql_connect.cc sql/sql_select.cc sql/sql_show.cc storage/innobase/row/row0mysql.c storage/innobase/srv/srv0start.c storage/innobase/sync/sync0rw.c storage/innodb_plugin/ChangeLog storage/innodb_plugin/btr/btr0cur.c storage/innodb_plugin/buf/buf0flu.c storage/innodb_plugin/dict/dict0crea.c storage/innodb_plugin/dict/dict0dict.c storage/innodb_plugin/dict/dict0load.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/include/btr0btr.h storage/innodb_plugin/include/btr0btr.ic storage/innodb_plugin/include/btr0cur.h storage/innodb_plugin/include/dict0dict.h storage/innodb_plugin/include/fil0fil.h storage/innodb_plugin/include/row0ins.h storage/innodb_plugin/include/row0upd.h storage/innodb_plugin/include/univ.i storage/innodb_plugin/row/row0ins.c storage/innodb_plugin/row/row0merge.c storage/innodb_plugin/row/row0mysql.c storage/innodb_plugin/row/row0sel.c storage/innodb_plugin/row/row0upd.c storage/innodb_plugin/srv/srv0start.c storage/innodb_plugin/sync/sync0rw.c storage/innodb_plugin/thr/thr0loc.c storage/innodb_plugin/trx/trx0i_s.c strings/CHARSET_INFO.txt strings/ctype-extra.c support-files/my-huge.cnf.sh support-files/my-innodb-heavy-4G.cnf.sh support-files/my-large.cnf.sh support-files/my-medium.cnf.sh support-files/my-small.cnf.sh support-files/mysql.spec.sh tests/mysql_client_test.c win/configure.js === modified file 'sql/sql_plugin.cc' --- a/sql/sql_plugin.cc 2010-12-01 12:54:50 +0000 +++ b/sql/sql_plugin.cc 2010-12-02 07:14:43 +0000 @@ -374,7 +374,8 @@ static st_plugin_dl *plugin_dl_add(const struct st_plugin_dl *tmp, plugin_dl; void *sym; DBUG_ENTER("plugin_dl_add"); - DBUG_PRINT("enter", ("dl->str: '%s', dl->length: %d", dl->str, dl->length)); + DBUG_PRINT("enter", ("dl->str: '%s', dl->length: %d", + dl->str, (int) dl->length)); plugin_dir_len= strlen(opt_plugin_dir); /* Ensure that the dll doesn't have a path. No bundle (reason: useless for push emails).