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

handler::ha_write_row_no_binlog() hack removed,

Browse Source 
existing table->no_replicate code is used instead
This commit is contained in:
serg@janus.mylan
2007-07-30 19:56:02 +02:00
parent 94820f1976
commit f451ac1f96
4 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sql/handler.cc
View File

@ -3654,19 +3654,6 @@ int handler::ha_write_row(uchar *buf)
}
/**
Write a record to the engine bypassing row-level binary logging.
This method is used internally by the server for writing to
performance schema tables, which are never replicated.
TODO: Merge this function with ha_write_row(), and provide a way
to disable the binlog there.
*/
int handler::ha_write_row_no_binlog(uchar *buf)
{
return write_row(buf);
}
int handler::ha_update_row(const uchar *old_data, uchar *new_data)
{
int error;

1
sql/handler.h
View File

@ -1158,7 +1158,6 @@ public:
*/
int ha_external_lock(THD *thd, int lock_type);
int ha_write_row(uchar * buf);
int ha_write_row_no_binlog(uchar * buf);
int ha_update_row(const uchar * old_data, uchar * new_data);
int ha_delete_row(const uchar * buf);

4
sql/log.cc
View File

@ -409,7 +409,7 @@ bool Log_to_csv_event_handler::
}
/* log table entries are not replicated */
if (table->file->ha_write_row_no_binlog(table->record[0]))
if (table->file->ha_write_row(table->record[0]))
{
struct tm start;
localtime_r(&event_time, &start);
@ -612,7 +612,7 @@ bool Log_to_csv_event_handler::
goto err;
/* log table entries are not replicated */
if (table->file->ha_write_row_no_binlog(table->record[0]))
if (table->file->ha_write_row(table->record[0]))
{
struct tm start;
localtime_r(&current_time, &start);

1
sql/sql_base.cc
View File

@ -7716,6 +7716,7 @@ open_performance_schema_table(THD *thd, TABLE_LIST *one_table,
DBUG_ASSERT(table->s->table_category == TABLE_CATEGORY_PERFORMANCE);
/* Make sure all columns get assigned to a default value */
table->use_all_columns();
table->no_replicate= 1;
}
DBUG_RETURN(table);