mirror of
https://github.com/MariaDB/server.git
synced 2025-07-08 17:02:21 +03:00
Fixed wrong arguments to printf and related functions
Other things, mainly to get create_mysqld_error_find_printf_error tool to work: - Added protection to not include mysqld_error.h twice - Include "unireg.h" instead of "mysqld_error.h" in server - Added protection if ER_XX messages are already defined - Removed wrong calls to my_error(ER_OUTOFMEMORY) as my_malloc() and my_alloc will do this automatically - Added missing %s to ER_DUP_QUERY_NAME - Removed old and wrong calls to my_strerror() when using MY_ERROR_ON_RENAME (wrong merge) - Fixed deadlock error message from Galera. Before the extra information given to ER_LOCK_DEADLOCK was missing because ER_LOCK_DEADLOCK doesn't provide any extra information. I kept #ifdef mysqld_error_find_printf_error_used in sql_acl.h to make it easy to do this kind of check again in the future
This commit is contained in:
@ -378,17 +378,13 @@ static bool exchange_name_with_ddl_log(THD *thd,
|
||||
*/
|
||||
/* call rename table from table to tmp-name */
|
||||
DBUG_EXECUTE_IF("exchange_partition_fail_3",
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0),
|
||||
name, tmp_name, 0, "n/a");
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name, 0);
|
||||
error_set= TRUE;
|
||||
goto err_rename;);
|
||||
DBUG_EXECUTE_IF("exchange_partition_abort_3", DBUG_SUICIDE(););
|
||||
if (file->ha_rename_table(name, tmp_name))
|
||||
{
|
||||
char errbuf[MYSYS_STRERROR_SIZE];
|
||||
my_strerror(errbuf, sizeof(errbuf), my_errno);
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name,
|
||||
my_errno, errbuf);
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), name, tmp_name, my_errno);
|
||||
error_set= TRUE;
|
||||
goto err_rename;
|
||||
}
|
||||
@ -399,17 +395,13 @@ static bool exchange_name_with_ddl_log(THD *thd,
|
||||
|
||||
/* call rename table from partition to table */
|
||||
DBUG_EXECUTE_IF("exchange_partition_fail_5",
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0),
|
||||
from_name, name, 0, "n/a");
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), from_name, name, 0);
|
||||
error_set= TRUE;
|
||||
goto err_rename;);
|
||||
DBUG_EXECUTE_IF("exchange_partition_abort_5", DBUG_SUICIDE(););
|
||||
if (file->ha_rename_table(from_name, name))
|
||||
{
|
||||
char errbuf[MYSYS_STRERROR_SIZE];
|
||||
my_strerror(errbuf, sizeof(errbuf), my_errno);
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), from_name, name,
|
||||
my_errno, errbuf);
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), from_name, name, my_errno);
|
||||
error_set= TRUE;
|
||||
goto err_rename;
|
||||
}
|
||||
@ -420,17 +412,13 @@ static bool exchange_name_with_ddl_log(THD *thd,
|
||||
|
||||
/* call rename table from tmp-nam to partition */
|
||||
DBUG_EXECUTE_IF("exchange_partition_fail_7",
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0),
|
||||
tmp_name, from_name, 0, "n/a");
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), tmp_name, from_name, 0);
|
||||
error_set= TRUE;
|
||||
goto err_rename;);
|
||||
DBUG_EXECUTE_IF("exchange_partition_abort_7", DBUG_SUICIDE(););
|
||||
if (file->ha_rename_table(tmp_name, from_name))
|
||||
{
|
||||
char errbuf[MYSYS_STRERROR_SIZE];
|
||||
my_strerror(errbuf, sizeof(errbuf), my_errno);
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), tmp_name, from_name,
|
||||
my_errno, errbuf);
|
||||
my_error(ER_ERROR_ON_RENAME, MYF(0), tmp_name, from_name, my_errno);
|
||||
error_set= TRUE;
|
||||
goto err_rename;
|
||||
}
|
||||
|
Reference in New Issue
Block a user