From: Tor Didriksen
Date: March 13 2012 7:40am
Subject: bzr push into mysql-trunk branch (tor.didriksen:3752 to 3753)
List-Archive: http://lists.mysql.com/commits/143179
Message-Id: <201203130740.q2D7eKFo001804@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3753 Tor Didriksen	2012-03-13
      Remove another ~800 warnings on windows
     @ sql/opt_explain_json.cc
        'opt_explain_json_namespace::union_result_ctx' : inherits 'opt_explain_json_namespace::table_base_ctx::opt_explain_json_namespace::table_base_ctx::id' via dominance
     @ sql/sql_error.cc
        warning C4267: 'argument' : conversion from 'size_t' to 'uint', possible loss of data
     @ sql/sql_error.h
        warning C4267: 'argument' : conversion from 'size_t' to 'uint', possible loss of data

    modified:
      sql/opt_explain_json.cc
      sql/sql_error.cc
      sql/sql_error.h
 3752 Luis Soares	2012-03-12
      BUG#12400313
      
      Recorded warnings related to "Sending passwords in plain text ..."in the result 
      file.

    modified:
      mysql-test/suite/rpl/r/rpl_stm_relay_ign_space.result
=== modified file 'sql/opt_explain_json.cc'
--- a/sql/opt_explain_json.cc	2012-02-29 12:37:34 +0000
+++ b/sql/opt_explain_json.cc	2012-03-13 07:39:53 +0000
@@ -604,6 +604,14 @@ public:
     unit_ctx(CTX_UNION_RESULT, K_UNION_RESULT, parent_arg)
   {}
 
+  // Remove warnings: 'inherits ... from ... via dominance'
+  virtual size_t id(bool hide) { return table_base_ctx::id(hide); }
+  virtual bool cacheable()     { return table_base_ctx::cacheable(); }
+  virtual bool dependent()     { return table_base_ctx::dependent(); }
+  virtual qep_row *entry()     { return table_base_ctx::entry(); }
+  virtual bool format_unit(Opt_trace_context *json)
+  { return table_base_ctx::format_unit(json); }
+
   void push_down_query_specs(List<context> *specs) { query_specs= specs; } 
 
   virtual bool add_subquery(subquery_list_enum subquery_type,
@@ -722,6 +730,19 @@ public:
     table_with_where_and_derived(CTX_MESSAGE, K_TABLE, parent_arg)
   {}
 
+  // Remove warnings: 'inherits ... from ... via dominance'
+  virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj)
+  { return table_base_ctx::format_body(json, obj); }
+  virtual size_t id(bool hide)
+  { return table_with_where_and_derived::id(hide); }
+  virtual bool cacheable()     { return table_base_ctx::cacheable(); }
+  virtual bool dependent()     { return table_base_ctx::dependent(); }
+  virtual qep_row *entry()     { return table_base_ctx::entry(); }
+  virtual bool format_derived(Opt_trace_context *json)
+  { return table_with_where_and_derived::format_derived(json); }
+  virtual bool format_where(Opt_trace_context *json)
+  { return table_with_where_and_derived::format_where(json); }
+
   virtual bool find_and_set_derived(context *subquery)
   {
     DBUG_ASSERT(derived_from == NULL);
@@ -764,6 +785,19 @@ public:
     table_with_where_and_derived(type_arg, K_TABLE, parent_arg)
   {}
 
+  // Remove warnings: 'inherits ... from ... via dominance'
+  virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj)
+  { return table_base_ctx::format_body(json, obj); }
+  virtual size_t id(bool hide)
+  { return table_with_where_and_derived::id(hide); }
+  virtual bool cacheable()     { return table_base_ctx::cacheable(); }
+  virtual bool dependent()     { return table_base_ctx::dependent(); }
+  virtual qep_row *entry()     { return table_base_ctx::entry(); }
+  virtual bool format_derived(Opt_trace_context *json)
+  { return table_with_where_and_derived::format_derived(json); }
+  virtual bool format_where(Opt_trace_context *json)
+  { return table_with_where_and_derived::format_where(json); }
+
   virtual void register_where_subquery(SELECT_LEX_UNIT *subquery)
   {
     List_iterator<SELECT_LEX_UNIT> it(where_subquery_units);
@@ -1225,6 +1259,23 @@ public:
   virtual bool cacheable() { return join_ctx::cacheable(); }
   virtual bool dependent() { return join_ctx::dependent(); }
 
+  // Remove warnings: 'inherits ... from ... via dominance'
+  virtual qep_row *entry()     { return table_base_ctx::entry(); }
+  virtual bool add_subquery(subquery_list_enum subquery_type, subquery_ctx *ctx)
+  { return join_ctx::add_subquery(subquery_type, ctx); }
+  virtual bool add_join_tab(joinable_ctx *ctx)
+  { return join_ctx::add_join_tab(ctx); }
+  virtual bool add_where_subquery(subquery_ctx *ctx, SELECT_LEX_UNIT *subquery)
+  { return join_ctx::add_where_subquery(ctx, subquery); }
+  virtual bool find_and_set_derived(context *subquery)
+  { return join_ctx::find_and_set_derived(subquery); }
+  virtual bool format_unit(Opt_trace_context *json)
+  { return unit_ctx::format_unit(json); }
+  virtual bool format_nested_loop(Opt_trace_context *json)
+  { return join_ctx::format_nested_loop(json); }
+  virtual void set_sort(sort_ctx *ctx)
+  { return join_ctx::set_sort(ctx); }
+
 private:
   virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj)
   {
@@ -1262,6 +1313,22 @@ public:
   virtual bool cacheable() { return join_ctx::cacheable(); }
   virtual bool dependent() { return join_ctx::dependent(); }
 
+  // Remove warnings: 'inherits ... from ... via dominance'
+  virtual bool add_join_tab(joinable_ctx *ctx)
+  { return join_ctx::add_join_tab(ctx); }
+  virtual bool add_subquery(subquery_list_enum subquery_type, subquery_ctx *ctx)
+  { return join_ctx::add_subquery(subquery_type, ctx); }
+  virtual bool add_where_subquery(subquery_ctx *ctx, SELECT_LEX_UNIT *subquery)
+  { return join_ctx::add_where_subquery(ctx, subquery); }
+  virtual bool find_and_set_derived(context *subquery)
+  { return join_ctx::find_and_set_derived(subquery); }
+  virtual bool format_nested_loop(Opt_trace_context *json)
+  { return join_ctx::format_nested_loop(json); }
+  virtual bool format_unit(Opt_trace_context *json)
+  { return unit_ctx::format_unit(json); }
+  virtual void set_sort(sort_ctx *ctx)
+  { return join_ctx::set_sort(ctx); }
+
 private:
   virtual bool format_body(Opt_trace_context *json, Opt_trace_object *obj)
   {

=== modified file 'sql/sql_error.cc'
--- a/sql/sql_error.cc	2011-12-09 21:08:37 +0000
+++ b/sql/sql_error.cc	2012-03-13 07:39:53 +0000
@@ -935,8 +935,8 @@ ErrConvString::ErrConvString(const struc
    number of bytes written to "to"
 */
 
-uint err_conv(char *buff, uint to_length, const char *from,
-              uint from_length, const CHARSET_INFO *from_cs)
+uint err_conv(char *buff, size_t to_length, const char *from,
+              size_t from_length, const CHARSET_INFO *from_cs)
 {
   char *to= buff;
   const char *from_start= from;

=== modified file 'sql/sql_error.h'
--- a/sql/sql_error.h	2011-12-09 21:08:37 +0000
+++ b/sql/sql_error.h	2012-03-13 07:39:53 +0000
@@ -526,13 +526,13 @@ private:
   friend class Diagnostics_area;
 };
 
-uint err_conv(char *buff, uint to_length, const char *from,
-              uint from_length, const CHARSET_INFO *from_cs);
+uint err_conv(char *buff, size_t to_length, const char *from,
+              size_t from_length, const CHARSET_INFO *from_cs);
 
 class ErrConvString
 {
   char err_buffer[MYSQL_ERRMSG_SIZE];
-  uint buf_length;
+  size_t buf_length;
 public:
   ErrConvString(String *str)
   {

No bundle (reason: useless for push emails).