Browse Source

fix my_error usage

bb-10.5-igor
Nikita Malyavin 5 years ago
parent
commit
765458c93c
  1. 10
      sql/item_strfunc.cc
  2. 2
      sql/sql_acl.cc
  3. 7
      sql/wsrep_mysqld.cc
  4. 5
      storage/innobase/handler/ha_innodb.cc

10
sql/item_strfunc.cc

@ -5327,7 +5327,7 @@ String *Item_func_wsrep_last_written_gtid::val_str_ascii(String *str)
{
if (gtid_str.alloc(WSREP_MAX_WSREP_SERVER_GTID_STR_LEN+1))
{
my_error(ER_OUTOFMEMORY, WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
my_error(ER_OUTOFMEMORY, MYF(0), WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
null_value= TRUE;
return 0;
}
@ -5352,7 +5352,7 @@ String *Item_func_wsrep_last_seen_gtid::val_str_ascii(String *str)
{
if (gtid_str.alloc(WSREP_MAX_WSREP_SERVER_GTID_STR_LEN+1))
{
my_error(ER_OUTOFMEMORY, WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
my_error(ER_OUTOFMEMORY, MYF(0), WSREP_MAX_WSREP_SERVER_GTID_STR_LEN);
null_value= TRUE;
return 0;
}
@ -5397,7 +5397,7 @@ longlong Item_func_wsrep_sync_wait_upto::val_int()
if (!(gtid_list= gtid_parse_string_to_list(gtid_str->ptr(), gtid_str->length(),
&count)))
{
my_error(ER_INCORRECT_GTID_STATE, MYF(0), func_name());
my_error(ER_INCORRECT_GTID_STATE, MYF(0));
null_value= TRUE;
return 0;
}
@ -5409,12 +5409,12 @@ longlong Item_func_wsrep_sync_wait_upto::val_int()
wait_gtid_ret= wsrep_gtid_server.wait_gtid_upto(gtid_list[0].seq_no, timeout);
if ((wait_gtid_ret == ETIMEDOUT) || (wait_gtid_ret == ETIME))
{
my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0), func_name());
my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
ret= 0;
}
else if (wait_gtid_ret == ENOMEM)
{
my_error(ER_OUTOFMEMORY, MYF(0), func_name());
my_error(ER_OUTOFMEMORY, MYF(0), sizeof(std::pair<uint64, mysql_cond_t*>));
ret= 0;
}
}

2
sql/sql_acl.cc

@ -3345,7 +3345,7 @@ end:
switch (result)
{
case ER_INVALID_CURRENT_USER:
my_error(ER_INVALID_CURRENT_USER, MYF(0), rolename);
my_error(ER_INVALID_CURRENT_USER, MYF(0));
break;
case ER_INVALID_ROLE:
/* Role doesn't exist at all */

7
sql/wsrep_mysqld.cc

@ -2468,8 +2468,11 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
if (!thd->is_error())
{
my_error(ER_LOCK_DEADLOCK, MYF(0), "WSREP replication failed. Check "
"your wsrep connection state and retry the query.");
push_warning_printf(thd, Sql_state_errno_level::WARN_LEVEL_ERROR,
ER_LOCK_DEADLOCK,
"WSREP replication failed. Check "
"your wsrep connection state and retry the query.");
my_error(ER_LOCK_DEADLOCK, MYF(0));
}
}
rc= -1;

5
storage/innobase/handler/ha_innodb.cc

@ -9530,8 +9530,7 @@ ha_innobase::ft_init_ext(
/* If tablespace is discarded, we should return here */
if (!ft_table->space) {
my_error(ER_TABLESPACE_MISSING, MYF(0), table->s->db.str,
table->s->table_name.str);
my_error(ER_TABLESPACE_MISSING, MYF(0), ft_table->name.m_name);
return(NULL);
}
@ -13892,7 +13891,7 @@ ha_innobase::rename_table(
error = DB_ERROR;
} else if (error == DB_LOCK_WAIT_TIMEOUT) {
my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0), to);
my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0));
error = DB_LOCK_WAIT;
}

Loading…
Cancel
Save