database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-4108 Compilation warnings with RelWithDebInfo

Browse Source 
only present in the Galera tree

Fix for some compiler warnings.
This commit is contained in:
Nirbhay Choubey
2013-11-25 12:40:08 -05:00
parent 071edcfea0
commit 88f0e0ebee
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/handler.cc
View File

@ -1297,7 +1297,9 @@ int ha_commit_trans(THD *thd, bool all)
*/
err= ht->prepare(ht, thd, all);
status_var_increment(thd->status_var.ha_prepare_count);
if (err)
{
#ifdef WITH_WSREP
if (WSREP(thd) && ht->db_type== DB_TYPE_WSREP)
{
@ -1309,9 +1311,14 @@ int ha_commit_trans(THD *thd, bool all)
}
}
else
{
/* not wsrep hton, bail to native mysql behavior */
#endif
my_error(ER_ERROR_DURING_COMMIT, MYF(0), err);
#ifdef WITH_WSREP
} /* End of else */
#endif
}
if (err)
goto err;