database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +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

3
mysys/my_getopt.c
View File

@ -840,7 +840,6 @@ static int findopt(char *optpat, uint length,
{ {
uint count; uint count;
const struct my_option *opt= *opt_res; const struct my_option *opt= *opt_res;
my_bool is_prefix= FALSE;
DBUG_ENTER("findopt"); DBUG_ENTER("findopt");
for (count= 0; opt->name; opt++) for (count= 0; opt->name; opt++)
@ -856,8 +855,6 @@ static int findopt(char *optpat, uint length,
/* We only need to know one prev */ /* We only need to know one prev */
count= 1; count= 1;
*ffname= opt->name; *ffname= opt->name;
if (opt->name[length])
is_prefix= TRUE;
} }
else if (strcmp(*ffname, opt->name)) else if (strcmp(*ffname, opt->name))
{ {

7
sql/handler.cc
View File

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

2
sql/sql_parse.cc
View File

@ -8220,7 +8220,7 @@ static inline wsrep_status_t wsrep_apply_rbr(
if (!ev) if (!ev)
{ {
WSREP_ERROR("applier could not read binlog event, seqno: %lld, len: %ld", WSREP_ERROR("applier could not read binlog event, seqno: %lld, len: %ld",
(long long)thd->wsrep_trx_seqno, buf_len); (long long)thd->wsrep_trx_seqno, (long int) buf_len);
rcode= 1; rcode= 1;
goto error; goto error;
} }

6
sql/sql_table.cc
View File

@ -6368,10 +6368,8 @@ bool mysql_alter_table(THD *thd,char *new_db, char *new_name,
error= 0; error= 0;
break; break;
} }
#ifdef WITH_WSREP
bool do_log_write(true); if (error == HA_ERR_WRONG_COMMAND)
#endif /* WITH_WSREP */
if (error == HA_ERR_WRONG_COMMAND)
{ {
error= 0; error= 0;
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE,

2
storage/innobase/lock/lock0lock.c
View File

@ -2231,7 +2231,7 @@ lock_rec_lock_slow(
{ {
trx_t* trx; trx_t* trx;
#ifdef WITH_WSREP #ifdef WITH_WSREP
lock_t *c_lock; lock_t *c_lock= 0;
#endif #endif
lock_t* lock; lock_t* lock;

2
storage/xtradb/lock/lock0lock.c
View File

@ -2211,7 +2211,7 @@ lock_rec_lock_slow(
{ {
trx_t* trx; trx_t* trx;
#ifdef WITH_WSREP #ifdef WITH_WSREP
lock_t *c_lock; lock_t *c_lock= 0;
#endif #endif
lock_t* lock; lock_t* lock;