1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #34458 Extreneous use of templates in server code

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


sql/handler.cc:
  Removing indentation and whitespace.
This commit is contained in:
unknown 2008-02-15 13:06:28 +01:00
parent 40176e1962
commit 450ed5aea6
1 changed files with 87 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sql/handler.cc
View File

@ -3843,8 +3843,8 @@ bool ha_show_status(THD *thd, handlerton *db_type, enum ha_stat_type stat)
- table is not mysql.event - 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) if (table->s->cached_row_logging_check == -1)
{ {
int const check(table->s->tmp_table == NO_TMP_TABLE && 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 && table->s->cached_row_logging_check &&
(thd->options & OPTION_BIN_LOG) && (thd->options & OPTION_BIN_LOG) &&
mysql_bin_log.is_open()); mysql_bin_log.is_open());
} }
/** @brief /** @brief
Write table maps for all (manually or automatically) locked tables 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 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_ENTER("write_locked_table_maps");
DBUG_PRINT("enter", ("thd: 0x%lx thd->lock: 0x%lx thd->locked_tables: 0x%lx " DBUG_PRINT("enter", ("thd: 0x%lx thd->lock: 0x%lx thd->locked_tables: 0x%lx "
"thd->extra_lock: 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); DBUG_RETURN(0);
} }
typedef bool Log_func(THD*, TABLE*, bool, MY_BITMAP*, typedef bool Log_func(THD*, TABLE*, bool, MY_BITMAP*,
uint, const uchar*, const uchar*); 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 *before_record,
const uchar *after_record, const uchar *after_record,
Log_func *log_func) Log_func *log_func)
{ {
if (table->no_replicate) if (table->no_replicate)
return 0; return 0;
bool error= 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; return error ? HA_ERR_RBR_LOGGING_FAILED : 0;
} }
int handler::ha_external_lock(THD *thd, int lock_type) int handler::ha_external_lock(THD *thd, int lock_type)
{ {