List:Commits« Previous MessageNext Message »
From:jonas oreland Date:February 13 2012 3:30pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4856 to 4857)
View as plain text  
 4857 jonas oreland	2012-02-13
      ndb - post 5.1.58 and .59 merge fix - silence compiler warning

    modified:
      client/sql_string.cc
      sql/sql_string.cc
 4856 jonas oreland	2012-02-13 [merge]
      ndb - merge 5.1.58 and .59 into 7.0

    removed:
      mysql-test/suite/bugs/
      mysql-test/suite/bugs/combinations
      mysql-test/suite/bugs/data/
      mysql-test/suite/bugs/data/rpl_bug12691.dat
      mysql-test/suite/bugs/r/
      mysql-test/suite/bugs/r/rpl_bug12691.result
      mysql-test/suite/bugs/r/rpl_bug31582.result
      mysql-test/suite/bugs/r/rpl_bug31583.result
      mysql-test/suite/bugs/r/rpl_bug33029.result
      mysql-test/suite/bugs/r/rpl_bug38205.result
      mysql-test/suite/bugs/t/
      mysql-test/suite/bugs/t/rpl_bug12691.test
      mysql-test/suite/bugs/t/rpl_bug31582.test
      mysql-test/suite/bugs/t/rpl_bug31583.test
      mysql-test/suite/bugs/t/rpl_bug33029.test
      mysql-test/suite/bugs/t/rpl_bug38205.test
    added:
      include/welcome_copyright_notice.h
      mysql-test/r/archive_debug.result
      mysql-test/r/implicit_char_to_num_conversion.result
      mysql-test/r/secure_file_priv_win.result
      mysql-test/suite/binlog/r/binlog_reset_master.result
      mysql-test/suite/binlog/t/binlog_reset_master.test
      mysql-test/suite/innodb/r/innodb_bug59410.result
      mysql-test/suite/innodb/r/innodb_bug59641.result
      mysql-test/suite/innodb/t/innodb_bug59410.test
      mysql-test/suite/innodb/t/innodb_bug59641.test
      mysql-test/suite/innodb_plugin/r/innodb_bug59410.result
      mysql-test/suite/innodb_plugin/r/innodb_bug59641.result
      mysql-test/suite/innodb_plugin/t/innodb_bug59410.test
      mysql-test/suite/innodb_plugin/t/innodb_bug59641.test
      mysql-test/suite/rpl/r/rpl_row_corruption.result
      mysql-test/suite/rpl/t/rpl_row_corruption-slave.opt
      mysql-test/suite/rpl/t/rpl_row_corruption.test
      mysql-test/t/archive_debug.test
      mysql-test/t/implicit_char_to_num_conversion.test
      mysql-test/t/secure_file_priv_win-master.opt
      mysql-test/t/secure_file_priv_win.test
    renamed:
      mysql-test/r/partition_not_embedded.result => mysql-test/r/partition_myisam.result
      mysql-test/suite/bugs/r/rpl_bug23533.result => mysql-test/suite/binlog/r/binlog_bug23533.result
      mysql-test/suite/bugs/r/rpl_bug36391.result => mysql-test/suite/binlog/r/binlog_bug36391.result
      mysql-test/suite/bugs/r/rpl_bug37426.result => mysql-test/suite/rpl/r/rpl_bug37426.result
      mysql-test/suite/bugs/t/rpl_bug23533.test => mysql-test/suite/binlog/t/binlog_bug23533.test
      mysql-test/suite/bugs/t/rpl_bug36391-master.opt => mysql-test/suite/binlog/t/binlog_bug36391-master.opt
      mysql-test/suite/bugs/t/rpl_bug36391.test => mysql-test/suite/binlog/t/binlog_bug36391.test
      mysql-test/suite/bugs/t/rpl_bug37426.test => mysql-test/suite/rpl/t/rpl_bug37426.test
      mysql-test/t/partition_not_embedded.test => mysql-test/t/partition_myisam.test
    modified:
      .bzrignore
      client/Makefile.am
      client/client_priv.h
      client/mysql.cc
      client/mysql_upgrade.c
      client/mysqladmin.cc
      client/mysqlbinlog.cc
      client/mysqlcheck.c
      client/mysqldump.c
      client/mysqlimport.c
      client/mysqlshow.c
      client/mysqltest.cc
      client/sql_string.cc
      cmd-line-utils/libedit/el.c
      cmd-line-utils/libedit/vi.c
      configure.in
      extra/innochecksum.c
      extra/perror.c
      extra/replace.c
      extra/yassl/src/yassl_error.cpp
      extra/yassl/src/yassl_int.cpp
      include/Makefile.am
      include/heap.h
      include/m_string.h
      include/my_bit.h
      include/my_bitmap.h
      include/my_getopt.h
      include/my_global.h
      include/myisam.h
      libmysql/CMakeLists.txt
      libmysql/Makefile.shared
      libmysqld/lib_sql.cc
      mysql-test/Makefile.am
      mysql-test/collections/default.experimental
      mysql-test/include/mtr_warnings.sql
      mysql-test/include/wait_until_disconnected.inc
      mysql-test/lib/My/ConfigFactory.pm
      mysql-test/lib/My/Find.pm
      mysql-test/lib/My/SafeProcess/safe_process.pl
      mysql-test/mysql-test-run.pl
      mysql-test/r/alter_table.result
      mysql-test/r/analyse.result
      mysql-test/r/events_1.result
      mysql-test/r/events_bugs.result
      mysql-test/r/events_restart.result
      mysql-test/r/explain.result
      mysql-test/r/func_group.result
      mysql-test/r/func_in.result
      mysql-test/r/func_math.result
      mysql-test/r/func_time.result
      mysql-test/r/gis-rtree.result
      mysql-test/r/having.result
      mysql-test/r/loaddata.result
      mysql-test/r/mysqlbinlog_base64.result
      mysql-test/r/order_by.result
      mysql-test/r/partition.result
      mysql-test/r/sp-error.result
      mysql-test/r/sp-security.result
      mysql-test/r/sp.result
      mysql-test/r/sp_sync.result
      mysql-test/r/subselect.result
      mysql-test/r/trigger-compat.result
      mysql-test/r/trigger.result
      mysql-test/r/type_float.result
      mysql-test/r/type_newdecimal.result
      mysql-test/r/type_timestamp.result
      mysql-test/r/union.result
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/federated/disabled.def
      mysql-test/suite/funcs_2/t/disabled.def
      mysql-test/suite/innodb/r/innodb_mysql.result
      mysql-test/suite/innodb/t/innodb_mysql.test
      mysql-test/suite/innodb_plugin/r/innodb-index.result
      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-index.test
      mysql-test/suite/innodb_plugin/t/innodb-zip.test
      mysql-test/suite/innodb_plugin/t/innodb_mysql.test
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb_team/t/disabled.def
      mysql-test/suite/rpl/r/rpl_relayspace.result
      mysql-test/suite/rpl/r/rpl_server_id2.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_relayspace.test
      mysql-test/suite/rpl/t/rpl_row_until.test
      mysql-test/suite/rpl/t/rpl_server_id2.test
      mysql-test/suite/sys_vars/t/disabled.def
      mysql-test/t/alter_table.test
      mysql-test/t/analyse.test
      mysql-test/t/disabled.def
      mysql-test/t/events_1.test
      mysql-test/t/events_bugs.test
      mysql-test/t/events_restart.test
      mysql-test/t/explain.test
      mysql-test/t/func_group.test
      mysql-test/t/func_in.test
      mysql-test/t/func_math.test
      mysql-test/t/func_time.test
      mysql-test/t/gis-rtree.test
      mysql-test/t/having.test
      mysql-test/t/loaddata.test
      mysql-test/t/mysqlbinlog_base64.test
      mysql-test/t/order_by.test
      mysql-test/t/partition.test
      mysql-test/t/sp-error.test
      mysql-test/t/sp-security.test
      mysql-test/t/sp.test
      mysql-test/t/sp_sync.test
      mysql-test/t/subselect.test
      mysql-test/t/trigger-compat.test
      mysql-test/t/type_float.test
      mysql-test/t/type_newdecimal.test
      mysql-test/t/type_timestamp.test
      mysql-test/t/union.test
      mysys/CMakeLists.txt
      mysys/Makefile.am
      mysys/my_bitmap.c
      mysys/my_compare.c
      mysys/my_net.c
      mysys/my_symlink.c
      plugin/fulltext/plugin_example.c
      scripts/make_win_bin_dist
      sql-common/my_time.c
      sql/derror.cc
      sql/event_db_repository.cc
      sql/event_db_repository.h
      sql/event_parse_data.cc
      sql/event_parse_data.h
      sql/events.cc
      sql/field.cc
      sql/field.h
      sql/gen_lex_hash.cc
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster_binlog.cc
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/handler.h
      sql/hostname.cc
      sql/item.cc
      sql/item_cmpfunc.cc
      sql/item_create.cc
      sql/item_func.cc
      sql/item_strfunc.cc
      sql/item_subselect.cc
      sql/item_sum.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log_event.cc
      sql/my_decimal.cc
      sql/my_decimal.h
      sql/mysql_priv.h
      sql/mysqld.cc
      sql/opt_range.cc
      sql/opt_sum.cc
      sql/password.c
      sql/protocol.cc
      sql/slave.cc
      sql/sp.cc
      sql/sp_head.cc
      sql/spatial.cc
      sql/sql_acl.cc
      sql/sql_analyse.cc
      sql/sql_base.cc
      sql/sql_binlog.cc
      sql/sql_class.cc
      sql/sql_class.h
      sql/sql_connect.cc
      sql/sql_db.cc
      sql/sql_insert.cc
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_load.cc
      sql/sql_parse.cc
      sql/sql_partition.cc
      sql/sql_plugin.cc
      sql/sql_prepare.cc
      sql/sql_select.cc
      sql/sql_select.h
      sql/sql_show.cc
      sql/sql_string.cc
      sql/sql_table.cc
      sql/sql_trigger.cc
      sql/sql_trigger.h
      sql/sql_union.cc
      sql/sql_yacc.yy
      sql/table.cc
      sql/unireg.cc
      sql/unireg.h
      storage/archive/azio.c
      storage/archive/ha_archive.cc
      storage/heap/ha_heap.cc
      storage/heap/ha_heap.h
      storage/innobase/btr/btr0btr.c
      storage/innobase/btr/btr0cur.c
      storage/innobase/btr/btr0pcur.c
      storage/innobase/dict/dict0load.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/btr0btr.h
      storage/innobase/include/btr0cur.h
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      storage/innobase/include/btr0types.h
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/mtr0mtr.h
      storage/innobase/include/page0page.h
      storage/innobase/include/page0page.ic
      storage/innobase/include/rem0rec.h
      storage/innobase/include/rem0rec.ic
      storage/innobase/include/sync0sync.h
      storage/innobase/include/trx0roll.h
      storage/innobase/include/trx0sys.h
      storage/innobase/include/trx0sys.ic
      storage/innobase/include/trx0trx.h
      storage/innobase/include/univ.i
      storage/innobase/include/ut0mem.h
      storage/innobase/include/ut0mem.ic
      storage/innobase/log/log0log.c
      storage/innobase/mtr/mtr0mtr.c
      storage/innobase/page/page0page.c
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0row.c
      storage/innobase/row/row0sel.c
      storage/innobase/row/row0umod.c
      storage/innobase/row/row0upd.c
      storage/innobase/row/row0vers.c
      storage/innobase/sync/sync0rw.c
      storage/innobase/sync/sync0sync.c
      storage/innobase/trx/trx0rec.c
      storage/innobase/trx/trx0trx.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/buf0buddy.c
      storage/innodb_plugin/buf/buf0buf.c
      storage/innodb_plugin/buf/buf0flu.c
      storage/innodb_plugin/buf/buf0lru.c
      storage/innodb_plugin/buf/buf0rea.c
      storage/innodb_plugin/dict/dict0load.c
      storage/innodb_plugin/handler/ha_innodb.cc
      storage/innodb_plugin/handler/ha_innodb.h
      storage/innodb_plugin/handler/handler0alter.cc
      storage/innodb_plugin/include/btr0btr.h
      storage/innodb_plugin/include/btr0cur.h
      storage/innodb_plugin/include/btr0cur.ic
      storage/innodb_plugin/include/btr0pcur.h
      storage/innodb_plugin/include/btr0pcur.ic
      storage/innodb_plugin/include/buf0buddy.h
      storage/innodb_plugin/include/buf0buddy.ic
      storage/innodb_plugin/include/buf0buf.h
      storage/innodb_plugin/include/buf0buf.ic
      storage/innodb_plugin/include/buf0lru.h
      storage/innodb_plugin/include/buf0types.h
      storage/innodb_plugin/include/mtr0mtr.h
      storage/innodb_plugin/include/page0cur.ic
      storage/innodb_plugin/include/page0page.h
      storage/innodb_plugin/include/page0page.ic
      storage/innodb_plugin/include/rem0rec.h
      storage/innodb_plugin/include/rem0rec.ic
      storage/innodb_plugin/include/row0row.h
      storage/innodb_plugin/include/row0row.ic
      storage/innodb_plugin/include/row0upd.ic
      storage/innodb_plugin/include/srv0srv.h
      storage/innodb_plugin/include/sync0rw.ic
      storage/innodb_plugin/include/sync0sync.h
      storage/innodb_plugin/include/trx0sys.h
      storage/innodb_plugin/include/trx0sys.ic
      storage/innodb_plugin/include/trx0trx.h
      storage/innodb_plugin/include/trx0undo.h
      storage/innodb_plugin/include/univ.i
      storage/innodb_plugin/include/ut0mem.h
      storage/innodb_plugin/include/ut0mem.ic
      storage/innodb_plugin/log/log0log.c
      storage/innodb_plugin/mtr/mtr0mtr.c
      storage/innodb_plugin/page/page0cur.c
      storage/innodb_plugin/page/page0page.c
      storage/innodb_plugin/page/page0zip.c
      storage/innodb_plugin/rem/rem0rec.c
      storage/innodb_plugin/row/row0ins.c
      storage/innodb_plugin/row/row0row.c
      storage/innodb_plugin/row/row0sel.c
      storage/innodb_plugin/row/row0upd.c
      storage/innodb_plugin/row/row0vers.c
      storage/innodb_plugin/srv/srv0srv.c
      storage/innodb_plugin/sync/sync0rw.c
      storage/innodb_plugin/sync/sync0sync.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_stopwords.c
      storage/myisam/ha_myisam.cc
      storage/myisam/ha_myisam.h
      storage/myisam/mi_check.c
      storage/myisam/mi_create.c
      storage/myisam/mi_range.c
      storage/myisam/mi_test1.c
      storage/myisam/mi_update.c
      storage/myisam/mi_write.c
      storage/myisam/myisamdef.h
      storage/myisam/sp_test.c
      storage/myisammrg/ha_myisammrg.cc
      storage/myisammrg/ha_myisammrg.h
      storage/ndb/src/kernel/blocks/lgman.cpp
      strings/decimal.c
      support-files/mysql.spec.sh
      tests/mysql_client_test.c
      unittest/mysys/bitmap-t.c
      vio/viosocket.c
      win/build-vs10.bat
      win/build-vs10_x64.bat
      mysql-test/r/partition_myisam.result
      mysql-test/suite/binlog/r/binlog_bug23533.result
      mysql-test/suite/binlog/r/binlog_bug36391.result
      mysql-test/suite/rpl/r/rpl_bug37426.result
      mysql-test/suite/binlog/t/binlog_bug23533.test
      mysql-test/suite/binlog/t/binlog_bug36391.test
      mysql-test/suite/rpl/t/rpl_bug37426.test
      mysql-test/t/partition_myisam.test
=== modified file 'client/sql_string.cc'
--- a/client/sql_string.cc	2012-02-13 13:30:54 +0000
+++ b/client/sql_string.cc	2012-02-13 15:21:17 +0000
@@ -188,7 +188,8 @@ end:
 #else
 #ifdef HAVE_SNPRINTF
   buff[sizeof(buff)-1]=0;			// Safety
-  int num_chars= snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
+  IF_DBUG(int num_chars= )
+    snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
   DBUG_ASSERT(num_chars > 0);
   DBUG_ASSERT(num_chars < (int) sizeof(buff));
 #else

=== modified file 'sql/sql_string.cc'
--- a/sql/sql_string.cc	2012-02-13 13:30:54 +0000
+++ b/sql/sql_string.cc	2012-02-13 15:21:17 +0000
@@ -200,7 +200,8 @@ end:
 #else
 #ifdef HAVE_SNPRINTF
   buff[sizeof(buff)-1]=0;			// Safety
-  int num_chars= snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
+  IF_DBUG(int num_chars= )
+    snprintf(buff, sizeof(buff)-1, "%.*f",(int) decimals, num);
   DBUG_ASSERT(num_chars > 0);
   DBUG_ASSERT(num_chars < (int) sizeof(buff));
 #else

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4856 to 4857) jonas oreland14 Feb