database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)

Browse Source 
remove:
* NDB from everywhere
* IM from mtr-v1
* packaging/rpm-oel and packaging/rpm-uln
* few unused spec files
* plug.in file
* .bzrignore
This commit is contained in:
Sergei Golubchik
2014-08-21 18:11:46 +02:00
parent 57dd1f6f3f
commit 7f5e51b940
1663 changed files with 138 additions and 530970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_repl.cc
View File

@ -3055,8 +3055,6 @@ int reset_slave(THD *thd, Master_info* mi)
DBUG_RETURN(ER_SLAVE_MUST_STOP);
}
ha_reset_slave(thd);
// delete relay logs, clear relay log coordinates
if ((error= purge_relay_logs(&mi->rli, thd,
1 /* just reset */,
@ -3619,13 +3617,6 @@ bool mysql_show_binlog_events(THD* thd)
/* select wich binary log to use: binlog or relay */
if ( thd->lex->sql_command == SQLCOM_SHOW_BINLOG_EVENTS )
{
/*
Wait for handlers to insert any pending information
into the binlog. For e.g. ndb which updates the binlog asynchronously
this is needed so that the uses sees all its own commands in the binlog
*/
ha_binlog_wait(thd);
binary_log= &mysql_bin_log;
}
else /* showing relay log contents */