List:Commits« Previous MessageNext Message »
From:Alexander Nozdrin Date:April 27 2012 2:46pm
Subject:bzr push into mysql-trunk branch (alexander.nozdrin:3756 to 3757)
View as plain text  
 3757 Alexander Nozdrin	2012-04-27 [merge]
      Auto-merge from 5.5.

    modified:
      sql/mysqld.cc
 3756 Jon Olav Hauglid	2012-04-27
      Bug#13945257 NEW COMPILATION ERRORS/WARNINGS WITH XCODE 4.3.2
      
      Fix various new compiler warnings and one compiler error
      reported by Clang 3.1 / XCode 4.3.2 of Mac OSX.
      
      See per-file messages for details.
     @ libmysqld/lib_sql.cc
        Fixed warning: implicit conversion from 'unsigned long' to 'int'
        changes value from 18446744073709551615 to -1
        [-Wconstant-conversion]
     @ sql/field.cc
        Fixed warning: using the result of an assignment as a condition
        without parentheses [-Wparentheses]
     @ sql/item_buff.cc
        Fixed warning: length modifier 'L' results in undefined behavior
        or no effect with 'd' conversion specifier [-Wformat]
     @ sql/item_timefunc.cc
        Fixed warning: argument to 'sizeof' in 'memset' call is the same
        expression as the destination; did you mean to dereference it?
        [-Wsizeof-pointer-memaccess]
     @ sql/log.cc
        Fixed warning: equality comparison with extraneous parentheses
        [-Wparentheses-equality]
     @ sql/log_event.cc
        Fixed warning: implicit conversion from 'ulong' (aka 'unsigned long')
        to 'uint' (aka 'unsigned int') changes value from 18446744073709551615
        to 4294967295 [-Wconstant-conversion]
     @ sql/opt_sum.cc
        Fixed warning: equality comparison with extraneous parentheses
        [-Wparentheses-equality]
     @ sql/sql_time.cc
        Fixed warning: using the result of an assignment as a condition
        without parentheses [-Wparentheses]
     @ sql/table.h
        Fixed warning: destination for this 'memset' call is a pointer to
        dynamic class 'TABLE'; vtable pointer will be overwritten
        [-Wdynamic-class-memaccess]
     @ storage/csv/ha_tina.cc
        Fixed warning: equality comparison with extraneous parentheses
        [-Wparentheses-equality]
     @ storage/federated/ha_federated.cc
        Fixed warning: equality comparison with extraneous parentheses
        [-Wparentheses-equality]
     @ storage/innobase/fil/fil0fil.cc
        Fixed warning: 'nonnull' attribute applied to function with no
        pointer arguments
     @ storage/innobase/include/dict0dict.h
        Fixed warning: 'nonnull' attribute applied to function with no
        pointer arguments
     @ storage/innobase/include/fil0fil.h
        Fixed warning: 'nonnull' attribute applied to function with no
        pointer arguments
     @ storage/innobase/include/fts0priv.ic
        Fixed warning: attribute declaration must precede definition
     @ storage/innobase/include/fts0types.ic
        Fixed warning: attribute declaration must precede definition
     @ unittest/gunit/decimal-t.cc
        Fixed warning: data argument not used by format string
        [-Wformat-extra-args]
     @ unittest/gunit/dynarray-t.cc
        Fixed error: call to function 'operator<<' that is neither visible
        in the template definition nor found by argument-dependent lookup

    modified:
      libmysqld/lib_sql.cc
      sql/field.cc
      sql/item_buff.cc
      sql/item_timefunc.cc
      sql/log.cc
      sql/log_event.cc
      sql/opt_sum.cc
      sql/sql_time.cc
      sql/table.h
      storage/csv/ha_tina.cc
      storage/federated/ha_federated.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/include/dict0dict.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fts0priv.ic
      storage/innobase/include/fts0types.ic
      unittest/gunit/decimal-t.cc
      unittest/gunit/dynarray-t.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-04-20 08:55:22 +0000
+++ b/sql/mysqld.cc	2012-04-27 14:45:47 +0000
@@ -2073,6 +2073,9 @@ static void network_init(void)
     struct addrinfo *ai, *a;
     struct addrinfo hints;
 
+    if (!my_bind_addr_str)
+      my_bind_addr_str= (char *) "0.0.0.0";
+
     sql_print_information("Server hostname (bind-address): '%s'; port: %d",
                           my_bind_addr_str, mysqld_port);
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (alexander.nozdrin:3756 to 3757) Alexander Nozdrin2 May