diff options
| author | Michael Widenius <monty@mysql.com> | 2009-01-16 11:38:02 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mysql.com> | 2009-01-16 11:38:02 +0200 |
| commit | 364f8611b0035e404b4acc137361176dea7a45bd (patch) | |
| tree | 13966e8d141c1fe4cfdd323f1fdcb06af862bb99 /sql/sql_insert.cc | |
| parent | 3fca23902cdf36bdc52f2d5826bfd24c2024feb8 (diff) | |
| download | mariadb-git-364f8611b0035e404b4acc137361176dea7a45bd.tar.gz | |
Fixed issues in last push found by pushbuild
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
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 1831e13dcf2..b10a7789079 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -3493,8 +3493,11 @@ static TABLE *create_table_from_items(THD *thd, HA_CREATE_INFO *create_info, MYSQL_LOCK_IGNORE_FLUSH, ¬_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) { |