database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Fixed issues in last push found by pushbuild

Browse Source 
sql/sql_insert.cc:
  Removed DBUG_ASSERT() that is triggered by deadlock-innodb test
storage/maria/ma_loghandler.c:
  Removed compiler warnings
storage/maria/trnman_public.h:
  Fixed wrong code from last push
This commit is contained in:
Michael Widenius
2009-01-16 11:38:02 +02:00
parent 3fca23902c
commit 364f8611b0
3 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_insert.cc
View File

@@ -3493,8 +3493,11 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info,
MYSQL_LOCK_IGNORE_FLUSH, &not_used)) ||
hooks->postlock(&table, 1))
{
DBUG_ASSERT(0); // This should never happen
/* purecov: begin tested */
/*
This can happen in innodb when you get a deadlock when using same table
in insert and select
*/
my_error(ER_CANT_LOCK, MYF(0), my_errno);
if (*lock)
{