Commit 868266f1 authored by unknown's avatar unknown
Browse files

Print a error message if the handler don't support transactional table 

locks (LOCK TABLES ... WHERE ENGINE = ).
 


sql/handler.h:
  Return a error if the handler don't support transactional table locks.
sql/lock.cc:
  Print a error message if the handler don't support transactional table
  locks.
parent 1bea012c

sql/handler.h

+7 −1
Original line number Diff line number Diff line
@@ -452,7 +452,13 @@ class handler :public Sql_alloc 
  { return extra(operation); }

  virtual int reset() { return extra(HA_EXTRA_RESET); }

  virtual int external_lock(THD *thd, int lock_type) { return 0; }

  virtual int transactional_table_lock(THD *thd, int lock_type) {return 0;}

  /*

    This is called to set transactional table lock to a table.

    If the handler don't support this, then this function will

    return HA_ERR_WRONG_COMMAND and MySQL will give

    ER_ILLEGAL_HA error message.

  */

  virtual int transactional_table_lock(THD *thd, int lock_type) {return HA_ERR_WRONG_COMMAND;}

  virtual void unlock_row() {}

  virtual int start_stmt(THD *thd) {return 0;}

  /*

sql/lock.cc

+14 −6
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static MYSQL_LOCK *get_lock_data(THD *thd, TABLE **table,uint count, 
				 bool unlock, TABLE **write_locked);

static int lock_external(THD *thd, TABLE **table,uint count);

static int unlock_external(THD *thd, TABLE **table,uint count);

static void print_lock_error(int error);

static void print_lock_error(int error, const char *);





MYSQL_LOCK *mysql_lock_tables(THD *thd,TABLE **tables,uint count)
@@ -187,7 +187,7 @@ static int lock_external(THD *thd, TABLE **tables, uint count) 
	(*tables)->file->external_lock(thd, F_UNLCK);

	(*tables)->current_lock=F_UNLCK;

      }

      print_lock_error(error);

      print_lock_error(error, (*tables)->file->table_type());

      DBUG_RETURN(error);

    }

    else
@@ -380,7 +380,7 @@ static int unlock_external(THD *thd, TABLE **table,uint count) 
    table++;

  } while (--count);

  if (error_code)

    print_lock_error(error_code);

    print_lock_error(error_code, (*table)->file->table_type());

  DBUG_RETURN(error_code);

}
@@ -683,7 +683,7 @@ void unlock_table_names(THD *thd, TABLE_LIST *table_list, 
}





static void print_lock_error(int error)

static void print_lock_error(int error, const char *table)

{

  int textno;

  DBUG_ENTER("print_lock_error");
@@ -698,11 +698,19 @@ static void print_lock_error(int error) 
  case HA_ERR_LOCK_DEADLOCK:

    textno=ER_LOCK_DEADLOCK;

    break;

  case HA_ERR_WRONG_COMMAND:

    textno=ER_ILLEGAL_HA;

    break;

  default:

    textno=ER_CANT_LOCK;

    break;

  }



  if ( textno == ER_ILLEGAL_HA )

    my_error(textno, MYF(ME_BELL+ME_OLDWIN+ME_WAITTANG), table);

  else

    my_error(textno, MYF(ME_BELL+ME_OLDWIN+ME_WAITTANG), error);



  DBUG_VOID_RETURN;

}
@@ -977,7 +985,7 @@ int transactional_lock_tables(THD *thd, TABLE_LIST *tables, uint counter) 


    if ((error=(*start)->file->transactional_table_lock(thd, lock_type)))

    {

      print_lock_error(error);

      print_lock_error(error, (*start)->file->table_type());

      DBUG_RETURN(-1);

    }

    else