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-8453 Alter table not returning engine errors

Browse Source 
remove ~15 years old print_lock_error() function, use
handler::print_error() instead

Backport from 10.1
This commit is contained in:
Sergei Golubchik
2015-11-13 17:53:16 +01:00
parent 3d2067460e
commit 60343871a7
4 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/handler.cc
View File

@ -3650,6 +3650,8 @@ void handler::print_error(int error, myf errflag)
*/
bool handler::get_error_message(int error, String* buf)
{
DBUG_EXECUTE_IF("external_lock_failure",
buf->set_ascii(STRING_WITH_LEN("KABOOM!")););
return FALSE;
}
@ -5944,6 +5946,8 @@ int handler::ha_external_lock(THD *thd, int lock_type)
MYSQL_TABLE_LOCK_WAIT(m_psi, PSI_TABLE_EXTERNAL_LOCK, lock_type,
{ error= external_lock(thd, lock_type); })
DBUG_EXECUTE_IF("external_lock_failure", error= HA_ERR_GENERIC;);
if (error == 0 || lock_type == F_UNLCK)
{
m_lock_type= lock_type;