From: Jon Olav Hauglid Date: June 29 2012 12:21pm Subject: bzr push into mysql-trunk branch (jon.hauglid:3928 to 3929) List-Archive: http://lists.mysql.com/commits/144356 Message-Id: <20120629122128.26123.62950.3929@atum08.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3929 Jon Olav Hauglid 2012-06-29 [merge] Merge from mysql-5.6 to mysql-trunk No conflicts modified: client/mysqlbinlog.cc client/mysqltest.cc include/my_getopt.h plugin/semisync/semisync.cc plugin/semisync/semisync.h plugin/semisync/semisync_master_plugin.cc plugin/semisync/semisync_slave_plugin.cc sql/sql_plugin.cc sql/sql_plugin.h sql/sql_profile.cc 3928 Gleb Shchepa 2012-06-29 [merge] auto-merge (backport of WL6219) modified: mysql-test/r/type_year.result mysql-test/t/type_year.test === modified file 'client/mysqlbinlog.cc' --- a/client/mysqlbinlog.cc 2012-06-25 09:28:20 +0000 +++ b/client/mysqlbinlog.cc 2012-06-29 11:56:41 +0000 @@ -1350,7 +1350,7 @@ static struct my_option my_long_options[ "Stop reading the binlog at position N. Applies to the last binlog " "passed on the command line.", &stop_position, &stop_position, 0, GET_ULL, - REQUIRED_ARG, (ulonglong)(~(my_off_t)0), BIN_LOG_HEADER_SIZE, + REQUIRED_ARG, (longlong)(~(my_off_t)0), BIN_LOG_HEADER_SIZE, (ulonglong)(~(my_off_t)0), 0, 0, 0}, {"to-last-log", 't', "Requires -R. Will not stop at the end of the " "requested binlog but rather continue printing until the end of the last " === modified file 'client/mysqltest.cc' --- a/client/mysqltest.cc 2012-06-14 11:51:32 +0000 +++ b/client/mysqltest.cc 2012-06-29 11:56:41 +0000 @@ -2577,7 +2577,7 @@ typedef struct static st_error global_error_names[] = { - { "", -1, "" }, + { "", -1U, "" }, #include { 0, 0, 0 } }; === modified file 'include/my_getopt.h' --- a/include/my_getopt.h 2012-03-06 14:29:42 +0000 +++ b/include/my_getopt.h 2012-06-29 11:56:41 +0000 @@ -1,5 +1,5 @@ /* - Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -80,7 +80,7 @@ struct my_option enum get_opt_arg_type arg_type; /**< e.g. REQUIRED_ARG or OPT_ARG */ longlong def_value; /**< Default value */ longlong min_value; /**< Min allowed value (for numbers) */ - longlong max_value; /**< Max allowed value (for numbers) */ + ulonglong max_value; /**< Max allowed value (for numbers) */ longlong sub_size; /**< Unused */ long block_size; /**< Value should be a mult. of this (for numbers) */ void *app_type; /**< To be used by an application */ === modified file 'plugin/semisync/semisync.cc' --- a/plugin/semisync/semisync.cc 2009-09-26 04:49:49 +0000 +++ b/plugin/semisync/semisync.cc 2012-06-29 11:36:01 +0000 @@ -26,5 +26,5 @@ const unsigned long Trace::kTraceDetail const unsigned long Trace::kTraceNetWait = 0x0020; const unsigned long Trace::kTraceFunction = 0x0040; -const char ReplSemiSyncBase::kSyncHeader[2] = +const unsigned char ReplSemiSyncBase::kSyncHeader[2] = {ReplSemiSyncBase::kPacketMagicNum, 0}; === modified file 'plugin/semisync/semisync.h' --- a/plugin/semisync/semisync.h 2010-03-31 14:05:33 +0000 +++ b/plugin/semisync/semisync.h 2012-06-29 11:36:01 +0000 @@ -71,7 +71,7 @@ public: class ReplSemiSyncBase :public Trace { public: - static const char kSyncHeader[2]; /* three byte packet header */ + static const unsigned char kSyncHeader[2]; /* three byte packet header */ /* Constants in network packet header. */ static const unsigned char kPacketMagicNum; === modified file 'plugin/semisync/semisync_master_plugin.cc' --- a/plugin/semisync/semisync_master_plugin.cc 2011-09-21 11:01:41 +0000 +++ b/plugin/semisync/semisync_master_plugin.cc 2012-06-29 11:56:41 +0000 @@ -180,7 +180,7 @@ static MYSQL_SYSVAR_ULONG(timeout, rpl_s "The timeout value (in ms) for semi-synchronous replication in the master", NULL, // check fix_rpl_semi_sync_master_timeout, // update - 10000, 0, ~0L, 1); + 10000, 0, ~0UL, 1); static MYSQL_SYSVAR_BOOL(wait_no_slave, rpl_semi_sync_master_wait_no_slave, PLUGIN_VAR_OPCMDARG, @@ -194,7 +194,7 @@ static MYSQL_SYSVAR_ULONG(trace_level, r "The tracing level for semi-sync replication.", NULL, // check &fix_rpl_semi_sync_master_trace_level, // update - 32, 0, ~0L, 1); + 32, 0, ~0UL, 1); static SYS_VAR* semi_sync_master_system_vars[]= { MYSQL_SYSVAR(enabled), === modified file 'plugin/semisync/semisync_slave_plugin.cc' --- a/plugin/semisync/semisync_slave_plugin.cc 2011-09-21 11:01:41 +0000 +++ b/plugin/semisync/semisync_slave_plugin.cc 2012-06-29 11:56:41 +0000 @@ -161,7 +161,7 @@ static MYSQL_SYSVAR_ULONG(trace_level, r "The tracing level for semi-sync replication.", NULL, // check &fix_rpl_semi_sync_trace_level, // update - 32, 0, ~0L, 1); + 32, 0, ~0UL, 1); static SYS_VAR* semi_sync_slave_system_vars[]= { MYSQL_SYSVAR(enabled), === modified file 'sql/sql_plugin.cc' --- a/sql/sql_plugin.cc 2012-05-31 15:33:21 +0000 +++ b/sql/sql_plugin.cc 2012-06-29 11:56:41 +0000 @@ -727,7 +727,7 @@ bool plugin_is_ready(const LEX_STRING *n } -SHOW_COMP_OPTION plugin_status(const char *name, int len, size_t type) +SHOW_COMP_OPTION plugin_status(const char *name, size_t len, int type) { LEX_STRING plugin_name= { (char *) name, len }; return plugin_status(&plugin_name, type); === modified file 'sql/sql_plugin.h' --- a/sql/sql_plugin.h 2011-12-09 21:08:37 +0000 +++ b/sql/sql_plugin.h 2012-06-29 11:56:41 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -158,7 +158,7 @@ extern bool mysql_uninstall_plugin(THD * extern bool plugin_register_builtin(struct st_mysql_plugin *plugin); extern void plugin_thdvar_init(THD *thd, bool enable_plugins); extern void plugin_thdvar_cleanup(THD *thd); -extern SHOW_COMP_OPTION plugin_status(const char *name, int len, size_t type); +extern SHOW_COMP_OPTION plugin_status(const char *name, size_t len, int type); extern bool check_valid_path(const char *path, size_t length); typedef my_bool (plugin_foreach_func)(THD *thd, === modified file 'sql/sql_profile.cc' --- a/sql/sql_profile.cc 2012-03-30 15:38:01 +0000 +++ b/sql/sql_profile.cc 2012-06-29 11:56:41 +0000 @@ -1,4 +1,4 @@ -/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,8 +88,8 @@ ST_FIELD_INFO query_profile_statistics_i int make_profile_table_for_show(THD *thd, ST_SCHEMA_TABLE *schema_table) { - int profile_options = thd->lex->profile_options; - int fields_include_condition_truth_values[]= { + uint profile_options = thd->lex->profile_options; + uint fields_include_condition_truth_values[]= { FALSE, /* Query_id */ FALSE, /* Seq */ TRUE, /* Status */ No bundle (reason: useless for push emails).