Manual merge from next-mr.

1 files changed, 1 insertions, 12 deletions

diff --git a/sql/handler.cc b/sql/handler.cc
index 48cf591abc1..f52e1bd5ed1 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -307,7 +307,6 @@ const char **get_handler_errmsgs()
 int ha_init_errors(void)
 {
 #define SETMSG(nr, msg) handler_errmsgs[(nr) - HA_ERR_FIRST]= (msg)
-  const char    **errmsgs;
 
   /* Allocate a pointer array for the error message strings. */
   /* Zerofill it to avoid uninitialized gaps. */
@@ -3696,7 +3695,6 @@ int ha_create_table_from_engine(THD* thd, const char *db, const char *name)
 void st_ha_check_opt::init()
 {
   flags= sql_flags= 0;
-  sort_buffer_size = current_thd->variables.myisam_sort_buff_size;
 }
 
 
@@ -3774,15 +3772,6 @@ int ha_change_key_cache_param(KEY_CACHE *key_cache)
 }
 
 /**
-  Free memory allocated by a key cache.
-*/
-int ha_end_key_cache(KEY_CACHE *key_cache)
-{
-  end_key_cache(key_cache, 1);		// Can never fail
-  return 0;
-}
-
-/**
   Move all tables from one key cache to another one.
 */
 int ha_change_key_cache(KEY_CACHE *old_key_cache,
@@ -4489,7 +4478,7 @@ static bool check_table_binlog_row_based(THD *thd, TABLE *table)
 
   return (thd->is_current_stmt_binlog_format_row() &&
           table->s->cached_row_logging_check &&
-          (thd->options & OPTION_BIN_LOG) &&
+          (thd->variables.option_bits & OPTION_BIN_LOG) &&
           mysql_bin_log.is_open());
 }