diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-28 12:28:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-28 12:28:16 +0200 |
| commit | b74eb5a5feb41164f7e5cab986cf203537c2128a (patch) | |
| tree | 1897bcb664a4c21d07b702fa116a30607244b356 /storage | |
| parent | 8634f7e5285021370c100850a7d1a4ee0dc1c93e (diff) | |
| download | mariadb-git-b74eb5a5feb41164f7e5cab986cf203537c2128a.tar.gz | |
row_drop_table_for_mysql(): Correct a parameter to innobase_format_name()
This fixes a regression that was introduced in MySQL 5.6.6
in an error handling code path, in the following change:
commit 024f363d6b5f09b20d1bba411af55be95c7398d3
Author: kevin.lewis@oracle.com <>
Date: Fri Jun 15 09:01:42 2012 -0500
Bug #14169459 INNODB; DROP TABLE DOES NOT DELETE THE IBD FILE
FOR A TEMPORARY TABLE.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/row/row0mysql.cc | 3 | ||||
| -rw-r--r-- | storage/xtradb/row/row0mysql.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc index d9e18a99201..68329658618 100644 --- a/storage/innobase/row/row0mysql.cc +++ b/storage/innobase/row/row0mysql.cc @@ -4323,7 +4323,8 @@ do_drop: char msg_tablename[MAX_FULL_NAME_LEN + 1]; innobase_format_name( - msg_tablename, sizeof(tablename), + msg_tablename, + sizeof msg_tablename, tablename, FALSE); ib_logf(IB_LOG_LEVEL_INFO, diff --git a/storage/xtradb/row/row0mysql.cc b/storage/xtradb/row/row0mysql.cc index cb6e6bbcb1f..e828d8a8611 100644 --- a/storage/xtradb/row/row0mysql.cc +++ b/storage/xtradb/row/row0mysql.cc @@ -4347,7 +4347,8 @@ do_drop: char msg_tablename[MAX_FULL_NAME_LEN + 1]; innobase_format_name( - msg_tablename, sizeof(tablename), + msg_tablename, + sizeof msg_tablename, tablename, FALSE); ib_logf(IB_LOG_LEVEL_INFO, |