bzr push into mysql-5.5-innodb branch (vasil.dimov:3224 to 3225)

[vasil.dimov]

 3225 Vasil Dimov	2010-09-28
      Manually merge a GCC warning fix from 5.1 to 5.5:
      
        ------------------------------------------------------------
        revno: 3615
        revision-id: vasil.dimov@stripped
        parent: vasil.dimov@stripped
        committer: Vasil Dimov <vasil.dimov@stripped>
        branch nick: mysql-5.1-innodb
        timestamp: Tue 2010-09-28 11:12:34 +0300
        message:
          Silence a GCC warning about reaching the end of non-void func
          
          Spotted by:	Marko

    modified:
      storage/innobase/handler/i_s.cc
 3224 Vasil Dimov	2010-09-28 [merge]
      Merge mysql-5.5-bugfixing -> mysql-5.5-innodb

    added:
      mysql-test/suite/perfschema/r/checksum.result
      mysql-test/suite/perfschema/t/checksum.test
    modified:
      dbug/dbug.c
      include/mysql/service_my_snprintf.h
      mysql-test/include/default_mysqld.cnf
      mysql-test/r/func_time.result
      mysql-test/r/parser.result
      mysql-test/r/select.result
      mysql-test/r/strict.result
      mysql-test/r/type_datetime.result
      mysql-test/r/type_newdecimal.result
      mysql-test/suite/perfschema/include/upgrade_check.inc
      mysql-test/suite/perfschema/r/server_init.result
      mysql-test/suite/perfschema/r/start_server_no_cond_class.result
      mysql-test/suite/perfschema/r/start_server_no_cond_inst.result
      mysql-test/suite/perfschema/r/start_server_no_file_class.result
      mysql-test/suite/perfschema/r/start_server_no_file_inst.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_class.result
      mysql-test/suite/perfschema/r/start_server_no_mutex_inst.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_class.result
      mysql-test/suite/perfschema/r/start_server_no_rwlock_inst.result
      mysql-test/suite/perfschema/r/start_server_no_thread_class.result
      mysql-test/suite/perfschema/r/start_server_no_thread_inst.result
      mysql-test/suite/perfschema/r/start_server_off.result
      mysql-test/suite/perfschema/r/start_server_on.result
      mysql-test/suite/perfschema/t/server_init.test
      mysql-test/t/strict.test
      mysql-test/t/type_datetime.test
      mysql-test/t/type_newdecimal.test
      mysql-test/valgrind.supp
      mysys/my_gethwaddr.c
      mysys/my_sync.c
      sql/field.cc
      sql/item_timefunc.cc
      sql/item_timefunc.h
      sql/log.cc
      sql/log.h
      sql/mysqld.cc
      sql/set_var.h
      sql/sql_plugin.cc
      sql/sql_repl.cc
      storage/perfschema/ha_perfschema.cc
      storage/perfschema/pfs_engine_table.cc
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
      strings/my_vsnprintf.c
      unittest/mysys/my_vsnprintf-t.c
=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc	revid:vasil.dimov@stripped
+++ b/storage/innobase/handler/i_s.cc	revid:vasil.dimov@stripped
@@ -1192,8 +1192,8 @@ trx_i_s_common_fill_table(
 	deadlock occurs between the mysqld server and mysql client,
 	see http://bugs.mysql.com/29900 ; when that bug is resolved
 	we can enable the DBUG_RETURN(ret) above */
-	DBUG_RETURN(0);
 	ret++;  // silence a gcc46 warning
+	DBUG_RETURN(0);
 #endif
 }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]