mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clearer error message when one forgot to grant REPLICATION SLAVE :

Browse source 
now we'll have something like this :
030308 18:46:58  Slave I/O thread: connected to master 'gb@localhost:3306',  replication started in log 'FIRST' at position 4
030308 18:46:58  While trying to obtain the list of slaves from the master 'localhost:3306', user 'gb' got the following error: 'Access denied. You need the REPLICATION SLAVE privilege for this operation'
030308 18:46:58  Slave I/O thread exiting, read up to log 'FIRST', position 4
instead of "Error updating slave list: Query error".
This fixes bug #80.
This commit is contained in:
guilhem@mysql.com 2003-03-08 18:53:32 +01:00
parent 299999264e
commit c6f241636f
3 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
sql/repl_failsafe.cc
View file

@ -446,8 +446,33 @@ int show_new_master(THD* thd)
}
}
/*
Asks the master for the list of its other connected slaves.
This is for failsafe replication :
in order for failsafe replication to work, the servers involved in replication
must know of each other. We accomplish this by having each slave report to the
master how to reach it, and on connection, each slave receives information
about where the other slaves are.
int update_slave_list(MYSQL* mysql)
SYNOPSIS
update_slave_list()
mysql pre-existing connection to the master
mi master info
NOTES
mi is used only to give detailed error messages which include the
hostname/port of the master, the username used by the slave to connect to
the master.
If the user used by the slave to connect to the master does not have the
REPLICATION SLAVE privilege, it will pop in this function because SHOW SLAVE
HOSTS will fail on the master.
RETURN VALUES
1 error
0 success
*/
int update_slave_list(MYSQL* mysql, MASTER_INFO* mi)
{
MYSQL_RES* res=0;
MYSQL_ROW row;
@ -459,7 +484,7 @@ int update_slave_list(MYSQL* mysql)
if (mc_mysql_query(mysql,"SHOW SLAVE HOSTS",0) ||
!(res = mc_mysql_store_result(mysql)))
{
error = "Query error";
error= mc_mysql_error(mysql);
goto err;
}
@ -473,7 +498,8 @@ int update_slave_list(MYSQL* mysql)
port_ind=4;
break;
default:
error = "Invalid number of fields in SHOW SLAVE HOSTS";
error= "the master returned an invalid number of fields for SHOW SLAVE \
HOSTS";
goto err;
}
@ -491,7 +517,7 @@ int update_slave_list(MYSQL* mysql)
{
if (!(si = (SLAVE_INFO*)my_malloc(sizeof(SLAVE_INFO), MYF(MY_WME))))
{
error = "Out of memory";
error= "the slave is out of memory";
pthread_mutex_unlock(&LOCK_slave_list);
goto err;
}
@ -515,7 +541,9 @@ err:
mc_mysql_free_result(res);
if (error)
{
sql_print_error("Error updating slave list: %s",error);
sql_print_error("While trying to obtain the list of slaves from the master \
'%s:%d', user '%s' got the following error: '%s'",
mi->host, mi->port, mi->user, error);
DBUG_RETURN(1);
}
DBUG_RETURN(0);

2
sql/repl_failsafe.h
View file

@ -19,7 +19,7 @@ extern const char* rpl_role_type[], *rpl_status_type[];
pthread_handler_decl(handle_failsafe_rpl,arg);
void change_rpl_status(RPL_STATUS from_status, RPL_STATUS to_status);
int find_recovery_captain(THD* thd, MYSQL* mysql);
int update_slave_list(MYSQL* mysql);
int update_slave_list(MYSQL* mysql, MASTER_INFO* mi);
extern HASH slave_list;

2
sql/slave.cc
View file

@ -2173,7 +2173,7 @@ connected:
on with life.
*/
thd->proc_info = "Registering slave on master";
if (register_slave_on_master(mysql) || update_slave_list(mysql))
if (register_slave_on_master(mysql) || update_slave_list(mysql, mi))
goto err;
}