rename binlog_show_create_table_() to binlog_show_create_table()
Other things: - Removed not existing binlog_show_create_table() declaration in class select_create()
This commit is contained in:
parent
1f85eeeb53
commit
efc5d3f84d
@ -6565,7 +6565,6 @@ public:
|
|||||||
}
|
}
|
||||||
int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
|
int prepare(List<Item> &list, SELECT_LEX_UNIT *u) override;
|
||||||
|
|
||||||
int binlog_show_create_table(TABLE **tables, uint count);
|
|
||||||
bool store_values(List<Item> &values, bool *trg_skip_row) override;
|
bool store_values(List<Item> &values, bool *trg_skip_row) override;
|
||||||
bool send_eof() override;
|
bool send_eof() override;
|
||||||
void abort_result_set() override;
|
void abort_result_set() override;
|
||||||
|
@ -98,7 +98,7 @@ static void unlink_blobs(TABLE *table);
|
|||||||
#endif
|
#endif
|
||||||
static bool check_view_insertability(THD *thd, TABLE_LIST *view,
|
static bool check_view_insertability(THD *thd, TABLE_LIST *view,
|
||||||
List<Item> &fields);
|
List<Item> &fields);
|
||||||
static int binlog_show_create_table_(THD *thd, TABLE *table,
|
static int binlog_show_create_table(THD *thd, TABLE *table,
|
||||||
Table_specification_st *create_info);
|
Table_specification_st *create_info);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -4976,7 +4976,7 @@ int select_create::postlock(THD *thd, TABLE **tables)
|
|||||||
TABLE const *const table = *tables;
|
TABLE const *const table = *tables;
|
||||||
if (thd->is_current_stmt_binlog_format_row() &&
|
if (thd->is_current_stmt_binlog_format_row() &&
|
||||||
!table->s->tmp_table)
|
!table->s->tmp_table)
|
||||||
return binlog_show_create_table_(thd, *tables, create_info);
|
return binlog_show_create_table(thd, *tables, create_info);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -5099,7 +5099,7 @@ select_create::prepare(List<Item> &_values, SELECT_LEX_UNIT *u)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static int binlog_show_create_table_(THD *thd, TABLE *table,
|
static int binlog_show_create_table(THD *thd, TABLE *table,
|
||||||
Table_specification_st *create_info)
|
Table_specification_st *create_info)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
@ -5193,7 +5193,7 @@ bool binlog_create_table(THD *thd, TABLE *table, bool replace)
|
|||||||
HA_CREATE_USED_DEFAULT_CHARSET);
|
HA_CREATE_USED_DEFAULT_CHARSET);
|
||||||
/* Ensure we write all engine options to binary log */
|
/* Ensure we write all engine options to binary log */
|
||||||
create_info.used_fields|= HA_CREATE_PRINT_ALL_OPTIONS;
|
create_info.used_fields|= HA_CREATE_PRINT_ALL_OPTIONS;
|
||||||
result= binlog_show_create_table_(thd, table, &create_info) != 0;
|
result= binlog_show_create_table(thd, table, &create_info) != 0;
|
||||||
thd->variables.option_bits= save_option_bits;
|
thd->variables.option_bits= save_option_bits;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user