mirror of
https://github.com/MariaDB/server.git
synced 2026-10-23 18:49:29 +03:00
Merge branch 'knielsen_log_event_read_validation_base_11.8' into 12.3
This merges the patch series that fixes a lot of missing validation checks for read_log_event(). The merge includes a few added fixes that are needed in new code introduced in 12.3. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
@@ -3245,6 +3245,11 @@ static bool prepare_db_action(THD *thd, privilege_t want_access,
|
||||
bool Sql_cmd_show_routine_code::execute(THD *thd)
|
||||
{
|
||||
sp_head *sp;
|
||||
#ifdef WITH_WSREP
|
||||
if (WSREP_CLIENT(thd) &&
|
||||
wsrep_sync_wait(thd, WSREP_SYNC_WAIT_BEFORE_SHOW))
|
||||
return true;
|
||||
#endif /* WITH_WSREP */
|
||||
if (m_handler->sp_cache_routine(thd, m_name, &sp))
|
||||
return true;
|
||||
if (!sp || sp->show_routine_code(thd))
|
||||
@@ -5514,6 +5519,7 @@ mysql_execute_command(THD *thd, bool is_called_from_prepared_stmt)
|
||||
There is no need to check for table permissions here, because
|
||||
if a user has no permissions to read a table, he won't be
|
||||
able to open it (with SQLCOM_HA_OPEN) in the first place.
|
||||
On implicit reopen mysql_ha_open() checks privileges again.
|
||||
*/
|
||||
unit->set_limit(select_lex);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user