mirror of
https://github.com/MariaDB/server.git
synced 2025-08-30 11:22:14 +03:00
Cleanup: Remove dead code
This commit is contained in:
@@ -2641,31 +2641,10 @@ mysql_execute_command(THD *thd)
|
|||||||
lex->sql_command == SQLCOM_SELECT) &&
|
lex->sql_command == SQLCOM_SELECT) &&
|
||||||
!wsrep_is_show_query(lex->sql_command))
|
!wsrep_is_show_query(lex->sql_command))
|
||||||
{
|
{
|
||||||
#if DIRTY_HACK
|
|
||||||
/* Dirty hack for lp:1002714 - trying to recognize mysqldump connection
|
|
||||||
* and allow it to continue. Actuall mysqldump_magic_str may be longer
|
|
||||||
* and is obviously version dependent and may be issued by any client
|
|
||||||
* connection after which connection becomes non-replicating. */
|
|
||||||
static char const mysqldump_magic_str[]=
|
|
||||||
"SELECT LOGFILE_GROUP_NAME, FILE_NAME, TOTAL_EXTENTS, INITIAL_SIZE, ENGINE, EXTRA FROM INFORMATION_SCHEMA.FILES WHERE FILE_TYPE = 'UNDO LOG' AND FILE_NAME IS NOT NULL";
|
|
||||||
static const size_t mysqldump_magic_str_len= sizeof(mysqldump_magic_str) -1;
|
|
||||||
if (SQLCOM_SELECT != lex->sql_command ||
|
|
||||||
thd->query_length() < mysqldump_magic_str_len ||
|
|
||||||
strncmp(thd->query(), mysqldump_magic_str, mysqldump_magic_str_len))
|
|
||||||
{
|
|
||||||
#endif /* DIRTY_HACK */
|
|
||||||
my_message(ER_UNKNOWN_COM_ERROR,
|
my_message(ER_UNKNOWN_COM_ERROR,
|
||||||
"WSREP has not yet prepared node for application use",
|
"WSREP has not yet prepared node for application use",
|
||||||
MYF(0));
|
MYF(0));
|
||||||
goto error;
|
goto error;
|
||||||
#if DIRTY_HACK
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
/* mysqldump connection, allow all further queries to pass */
|
|
||||||
thd->variables.wsrep_on= FALSE;
|
|
||||||
}
|
|
||||||
#endif /* DIRTY_HACK */
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif /* WITH_WSREP */
|
#endif /* WITH_WSREP */
|
||||||
|
Reference in New Issue
Block a user