database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-29499 Improving the 'Can't execute init_slave query' error message with the actual failure

Browse Source 
Currently, there are multiple error codes reported for the issue
'Can't execute init_slave query'. Those error codes are the underlying
reason the init_slave query cannot be executed, but this makes it
difficult to detect the issue in an automated way.

This patch introduces a new error code, ER_INIT_SLAVE_ERROR, to unify
all the errors related to the init_slave query. The ER_INIT_SLAVE_ERROR
error is raised for any issue related to the init_slave query, and the
underlying error code and message are included in the Last_SQL_Error
field.

Reviewed by:
Jimmy Hu <jimmy.hu@mariadb.com>
Brandon Nesterenko <brandon.nesterenko@mariadb.com>
This commit is contained in:
Apostolis Stamatis
2025-04-29 19:24:11 +03:00
committed by Brandon Nesterenko
parent 28dbfcb397
commit 247e2f8d4d
5 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/binlog_encryption/rpl_init_slave_errors.result
View File

@@ -15,8 +15,8 @@ connection slave;
reset slave; reset slave;
SET GLOBAL init_slave= "garbage"; SET GLOBAL init_slave= "garbage";
start slave; start slave;
include/wait_for_slave_sql_error.inc [errno=1064] include/wait_for_slave_sql_error.inc [errno=4226]
Last_SQL_Error = 'Slave SQL thread aborted. Can't execute init_slave query' Last_SQL_Error = 'Slave SQL thread aborted. Can't execute init_slave query due to error code 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1'
SET GLOBAL init_slave= ""; SET GLOBAL init_slave= "";
include/stop_slave_io.inc include/stop_slave_io.inc
RESET SLAVE; RESET SLAVE;

4
mysql-test/suite/rpl/r/rpl_init_slave_errors.result
View File

@@ -15,8 +15,8 @@ connection slave;
reset slave; reset slave;
SET GLOBAL init_slave= "garbage"; SET GLOBAL init_slave= "garbage";
start slave; start slave;
include/wait_for_slave_sql_error.inc [errno=1064] include/wait_for_slave_sql_error.inc [errno=4226]
Last_SQL_Error = 'Slave SQL thread aborted. Can't execute init_slave query' Last_SQL_Error = 'Slave SQL thread aborted. Can't execute init_slave query due to error code 1064: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'garbage' at line 1'
SET GLOBAL init_slave= ""; SET GLOBAL init_slave= "";
include/stop_slave_io.inc include/stop_slave_io.inc
RESET SLAVE; RESET SLAVE;

11
mysql-test/suite/rpl/t/rpl_init_slave_errors.test
View File

@@ -72,6 +72,10 @@ set @@global.debug_dbug = @saved_dbug;
###################################################################### ######################################################################
# Injecting faults in the init_slave option # Injecting faults in the init_slave option
###################################################################### ######################################################################
# MDEV-29499 introduces a new error code for init_slave errors
# 4226 = ER_INIT_SLAVE_ERROR
# 1064 = ER_PARSE_ERROR
connection slave; connection slave;
reset slave; reset slave;
@@ -79,11 +83,14 @@ reset slave;
SET GLOBAL init_slave= "garbage"; SET GLOBAL init_slave= "garbage";
start slave; start slave;
# 1064 = ER_PARSE_ERROR # 4226 = ER_INIT_SLAVE_ERROR
--let $slave_sql_errno= 1064 --let $slave_sql_errno= 4226
# This test also checks that the root error code - 1064 in this case - is
# included in the Last_SQL_Error
--let $show_slave_sql_error= 1 --let $show_slave_sql_error= 1
--source include/wait_for_slave_sql_error.inc --source include/wait_for_slave_sql_error.inc
###################################################################### ######################################################################
# Clean up # Clean up
###################################################################### ######################################################################

2
sql/share/errmsg-utf8.txt
View File

@@ -12328,3 +12328,5 @@ ER_WARN_MALFORMED_HINT
eng "Hint %s is ignored as malformed" eng "Hint %s is ignored as malformed"
ER_WARN_HINTS_ON_INSERT_PART_OF_INSERT_SELECT ER_WARN_HINTS_ON_INSERT_PART_OF_INSERT_SELECT
eng "Optimizer hints at the INSERT part of a INSERT..SELECT statement are not supported" eng "Optimizer hints at the INSERT part of a INSERT..SELECT statement are not supported"
ER_INIT_SLAVE_ERROR
eng "Slave SQL thread aborted. Can't execute init_slave query due to error code %u: %s"

5
sql/slave.cc
View File

@@ -5396,8 +5396,9 @@ pthread_handler_t handle_slave_sql(void *arg)
execute_init_command(thd, &opt_init_slave, &LOCK_sys_init_slave); execute_init_command(thd, &opt_init_slave, &LOCK_sys_init_slave);
if (unlikely(thd->is_slave_error)) if (unlikely(thd->is_slave_error))
{ {
rli->report(ERROR_LEVEL, thd->get_stmt_da()->sql_errno(), NULL, rli->report(ERROR_LEVEL, ER_INIT_SLAVE_ERROR, NULL,
"Slave SQL thread aborted. Can't execute init_slave query"); my_get_err_msg(ER_INIT_SLAVE_ERROR),
thd->get_stmt_da()->sql_errno(), thd->get_stmt_da()->message());
goto err; goto err;
} }
} }