diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-02-15 18:25:57 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-03-10 19:24:23 +0100 |
| commit | 7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359 (patch) | |
| tree | f8f9cab2cd92e43b5fd20c9ac77f9487ece4e5a7 /sql/sql_trigger.cc | |
| parent | 81cffda2e68ea5a155b74f24ae4345388afa963c (diff) | |
| download | mariadb-git-7af733a5a2cb7f79ffb5ff0129cad6db6f3cc359.tar.gz | |
perfschema compilation, test and misc fixes
Diffstat (limited to 'sql/sql_trigger.cc')
| -rw-r--r-- | sql/sql_trigger.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc index 27d89b630e3..cb10d8ecb3b 100644 --- a/sql/sql_trigger.cc +++ b/sql/sql_trigger.cc @@ -629,8 +629,8 @@ end: my_ok(thd); /* Drop statistics for this stored program from performance schema. */ MYSQL_DROP_SP(SP_TYPE_TRIGGER, - thd->lex->spname->m_db.str, thd->lex->spname->m_db.length, - thd->lex->spname->m_name.str, thd->lex->spname->m_name.length); + thd->lex->spname->m_db.str, static_cast<uint>(thd->lex->spname->m_db.length), + thd->lex->spname->m_name.str, static_cast<uint>(thd->lex->spname->m_name.length)); } DBUG_RETURN(result); @@ -1562,8 +1562,8 @@ bool Table_triggers_list::check_n_load(THD *thd, const LEX_CSTRING *db, } sp->m_sp_share= MYSQL_GET_SP_SHARE(SP_TYPE_TRIGGER, - sp->m_db.str, sp->m_db.length, - sp->m_name.str, sp->m_name.length); + sp->m_db.str, static_cast<uint>(sp->m_db.length), + sp->m_name.str, static_cast<uint>(sp->m_name.length)); #ifndef DBUG_OFF /* @@ -1858,8 +1858,8 @@ bool Table_triggers_list::drop_all_triggers(THD *thd, const LEX_CSTRING *db, result= 1; } /* Drop statistics for this stored program from performance schema. */ - MYSQL_DROP_SP(SP_TYPE_TRIGGER, db->str, db->length, - trigger->name.str, trigger->name.length); + MYSQL_DROP_SP(SP_TYPE_TRIGGER, db->str, static_cast<uint>(db->length), + trigger->name.str, static_cast<uint>(trigger->name.length)); } } } |