cleanup, remove dead code

7 files changed, 13 insertions, 65 deletions

diff --git a/include/thr_lock.h b/include/thr_lock.h
index d918d6d74f4..443d707bd2b 100644
--- a/include/thr_lock.h
+++ b/include/thr_lock.h
@@ -173,8 +173,6 @@ void thr_print_locks(void);		/* For debugging */
 my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data,
                                      enum thr_lock_type new_lock_type,
                                      ulong lock_wait_timeout);
-void    thr_downgrade_write_lock(THR_LOCK_DATA *data,
-                                 enum thr_lock_type new_lock_type);
 my_bool thr_reschedule_write_lock(THR_LOCK_DATA *data,
                                   ulong lock_wait_timeout);
 void thr_set_lock_wait_callback(void (*before_wait)(void),
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index c1ec062309b..729a18d4e13 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -1386,52 +1386,6 @@ my_bool thr_abort_locks_for_thread(THR_LOCK *lock, my_thread_id thread_id)
 }
 
 
-/*
-  Downgrade a WRITE_* to a lower WRITE level
-  SYNOPSIS
-    thr_downgrade_write_lock()
-    in_data                   Lock data of thread downgrading its lock
-    new_lock_type             New write lock type
-  RETURN VALUE
-    NONE
-  DESCRIPTION
-    This can be used to downgrade a lock already owned. When the downgrade
-    occurs also other waiters, both readers and writers can be allowed to
-    start.
-    The previous lock is often TL_WRITE_ONLY but can also be
-    TL_WRITE. The normal downgrade variants are:
-    TL_WRITE_ONLY => TL_WRITE after a short exclusive lock while holding a
-    write table lock
-    TL_WRITE_ONLY => TL_WRITE_ALLOW_WRITE After a short exclusive lock after
-    already earlier having dongraded lock to TL_WRITE_ALLOW_WRITE
-    The implementation is conservative and rather don't start rather than
-    go on unknown paths to start, the common cases are handled.
-
-    NOTE:
-    In its current implementation it is only allowed to downgrade from
-    TL_WRITE_ONLY. In this case there are no waiters. Thus no wake up
-    logic is required.
-*/
-
-void thr_downgrade_write_lock(THR_LOCK_DATA *in_data,
-                              enum thr_lock_type new_lock_type)
-{
-  THR_LOCK *lock=in_data->lock;
-#ifdef DBUG_ASSERT_EXISTS
-  enum thr_lock_type old_lock_type= in_data->type;
-#endif
-  DBUG_ENTER("thr_downgrade_write_only_lock");
-
-  mysql_mutex_lock(&lock->mutex);
-  DBUG_ASSERT(old_lock_type == TL_WRITE_ONLY);
-  DBUG_ASSERT(old_lock_type > new_lock_type);
-  in_data->type= new_lock_type;
-  check_locks(lock,"after downgrading lock", old_lock_type, 0);
-
-  mysql_mutex_unlock(&lock->mutex);
-  DBUG_VOID_RETURN;
-}
-
 /* Upgrade a WRITE_DELAY lock to a WRITE_LOCK */
 
 my_bool thr_upgrade_write_delay_lock(THR_LOCK_DATA *data,
diff --git a/sql/handler.h b/sql/handler.h
index d2ce4899e25..27061feb571 100644
--- a/sql/handler.h
+++ b/sql/handler.h
@@ -4298,8 +4298,7 @@ public:
     than lock_count() claimed. This can happen when the MERGE children
     are not attached when this is called from another thread.
   */
-  virtual THR_LOCK_DATA **store_lock(THD *thd,
-				     THR_LOCK_DATA **to,
+  virtual THR_LOCK_DATA **store_lock(THD *thd, THR_LOCK_DATA **to,
 				     enum thr_lock_type lock_type)=0;
 
   /** Type of table for caching query */
diff --git a/sql/lock.cc b/sql/lock.cc
index da13fff35c8..08514daddd8 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -816,9 +816,8 @@ MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table_ptr, uint count, uint flags)
     enum thr_lock_type lock_type;
     THR_LOCK_DATA **locks_start;
 
-    if (!((likely(!table->s->tmp_table) ||
-           (table->s->tmp_table == TRANSACTIONAL_TMP_TABLE)) &&
-          (!(flags & GET_LOCK_SKIP_SEQUENCES) || table->s->sequence == 0)))
+    if ((table->s->tmp_table && table->s->tmp_table != TRANSACTIONAL_TMP_TABLE)
+       || (flags & GET_LOCK_SKIP_SEQUENCES && table->s->sequence != NULL))
       continue;
     lock_type= table->reginfo.lock_type;
     DBUG_ASSERT(lock_type != TL_WRITE_DEFAULT && lock_type != TL_READ_DEFAULT);
diff --git a/sql/log_event_server.cc b/sql/log_event_server.cc
index 1ed50f71d1f..f6120582bf6 100644
--- a/sql/log_event_server.cc
+++ b/sql/log_event_server.cc
@@ -7617,12 +7617,11 @@ is_duplicate_key_error(int errcode)
   @c ha_update_row() or first deleted and then new record written.
 */ 
 
-int
-Rows_log_event::write_row(rpl_group_info *rgi,
-                          const bool overwrite)
+int Rows_log_event::write_row(rpl_group_info *rgi, const bool overwrite)
 {
   DBUG_ENTER("write_row");
-  DBUG_ASSERT(m_table != NULL && thd != NULL);
+  DBUG_ASSERT(m_table != NULL);
+  DBUG_ASSERT(thd != NULL);
 
   TABLE *table= m_table;  // pointer to event's table
   int error;
diff --git a/sql/rpl_record.cc b/sql/rpl_record.cc
index 3ed93b07529..be717b17b77 100644
--- a/sql/rpl_record.cc
+++ b/sql/rpl_record.cc
@@ -217,9 +217,9 @@ static int fill_extra_persistent_columns(TABLE *table, int master_cols)
    Found error when trying to unpack fields.
  */
 int unpack_row(rpl_group_info *rgi, TABLE *table, uint const colcnt,
-           uchar const *const row_data, MY_BITMAP const *cols,
-           uchar const **const current_row_end, ulong *const master_reclength,
-           uchar const *const row_end)
+               uchar const *const row_data, MY_BITMAP const *cols,
+               uchar const **const current_row_end,
+               ulong *const master_reclength, uchar const *const row_end)
 {
   int error;
   DBUG_ENTER("unpack_row");
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 07d31b0f9f3..0799fe8d033 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -10432,8 +10432,7 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
   */
   table_list->required_type= TABLE_TYPE_NORMAL;
 
-  if (alter_info->requested_lock == Alter_info::ALTER_TABLE_LOCK_SHARED
-      || alter_info->requested_lock > Alter_info::ALTER_TABLE_LOCK_NONE
+  if (alter_info->requested_lock > Alter_info::ALTER_TABLE_LOCK_NONE
       || alter_info->flags & ALTER_DROP_SYSTEM_VERSIONING
       || thd->lex->sql_command == SQLCOM_OPTIMIZE
       || alter_info->algorithm(thd) > Alter_info::ALTER_TABLE_ALGORITHM_COPY)
@@ -11992,9 +11991,9 @@ static int online_alter_read_from_binlog(THD *thd, rpl_group_info *rgi,
 
 static int
 copy_data_between_tables(THD *thd, TABLE *from, TABLE *to,
-			 List<Create_field> &create, bool ignore,
-			 uint order_num, ORDER *order,
-			 ha_rows *copied, ha_rows *deleted,
+                         List<Create_field> &create, bool ignore,
+                         uint order_num, ORDER *order,
+                         ha_rows *copied, ha_rows *deleted,
                          Alter_info::enum_enable_or_disable keys_onoff,
                          Alter_table_ctx *alter_ctx, bool online)
 {