Commit 450ed5ae authored by unknown's avatar unknown

Bug #34458 Extreneous use of templates in server code

Patch to remove white-space left over after removing anonymous
namespace.


sql/handler.cc:
  Removing indentation and whitespace.
parent 40176e19
......@@ -3843,8 +3843,8 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
- table is not mysql.event
*/
static bool check_table_binlog_row_based(THD *thd, TABLE *table)
{
static bool check_table_binlog_row_based(THD *thd, TABLE *table)
{
if (table->s->cached_row_logging_check == -1)
{
int const check(table->s->tmp_table == NO_TMP_TABLE &&
......@@ -3859,7 +3859,8 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
table->s->cached_row_logging_check &&
(thd->options & OPTION_BIN_LOG) &&
mysql_bin_log.is_open());
}
}
/** @brief
Write table maps for all (manually or automatically) locked tables
......@@ -3884,8 +3885,8 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
THD::locked_tables
*/
static int write_locked_table_maps(THD *thd)
{
static int write_locked_table_maps(THD *thd)
{
DBUG_ENTER("write_locked_table_maps");
DBUG_PRINT("enter", ("thd: 0x%lx thd->lock: 0x%lx thd->locked_tables: 0x%lx "
"thd->extra_lock: 0x%lx",
......@@ -3927,17 +3928,17 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
}
}
DBUG_RETURN(0);
}
}
typedef bool Log_func(THD*, TABLE*, bool, MY_BITMAP*,
uint, const uchar*, const uchar*);
static int binlog_log_row(TABLE* table,
static int binlog_log_row(TABLE* table,
const uchar *before_record,
const uchar *after_record,
Log_func *log_func)
{
{
if (table->no_replicate)
return 0;
bool error= 0;
......@@ -3972,7 +3973,7 @@ typedef bool Log_func(THD*, TABLE*, bool, MY_BITMAP*,
}
}
return error ? HA_ERR_RBR_LOGGING_FAILED : 0;
}
}
int handler::ha_external_lock(THD *thd, int lock_type)
{
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment