mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 07:35:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Manually merge a GCC warning fix from 5.1 to 5.5:

Browse source 
------------------------------------------------------------
  revno: 3615
  revision-id: vasil.dimov@oracle.com-20100928081234-22qbm6cwht521484
  parent: vasil.dimov@oracle.com-20100928063833-snn6cjwgksa6gk3b
  committer: Vasil Dimov <vasil.dimov@oracle.com>
  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
This commit is contained in:
Vasil Dimov 2010-09-28 11:14:42 +03:00
commit fbeb571369
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/innobase/handler/i_s.cc
View file

@ -1192,8 +1192,8 @@ trx_i_s_common_fill_table(
deadlock occurs between the mysqld server and mysql client, deadlock occurs between the mysqld server and mysql client,
see http://bugs.mysql.com/29900 ; when that bug is resolved see http://bugs.mysql.com/29900 ; when that bug is resolved
we can enable the DBUG_RETURN(ret) above */ we can enable the DBUG_RETURN(ret) above */
DBUG_RETURN(0);
ret++; // silence a gcc46 warning ret++; // silence a gcc46 warning
DBUG_RETURN(0);
#endif #endif
} }