diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-11-13 17:53:16 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-11-16 07:55:55 +0100 |
| commit | 296338147c75c273335e749b0c5427e196f0e683 (patch) | |
| tree | 604700e708629f85fa1204f8c85654ebf0ebeb17 /sql/handler.cc | |
| parent | daf3551cce65e7f80123838f1c3b731da209ee25 (diff) | |
| download | mariadb-git-296338147c75c273335e749b0c5427e196f0e683.tar.gz | |
MDEV-8453 Alter table not returning engine errors
remove ~15 years old print_lock_error() function, use
handler::print_error() instead
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 1d1dae75164..0f341a0ccc5 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3631,6 +3631,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; } @@ -5802,6 +5804,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) { m_lock_type= lock_type; |