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)) || MYSQL_LOCK_IGNORE_FLUSH, &not_used)) ||
hooks->postlock(&table, 1)) hooks->postlock(&table, 1))
{ {
DBUG_ASSERT(0); // This should never happen
/* purecov: begin tested */ /* 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); my_error(ER_CANT_LOCK, MYF(0), my_errno);
if (*lock) if (*lock)
{ {

7
storage/maria/ma_loghandler.c
View File

@@ -8311,8 +8311,11 @@ void translog_set_file_size(uint32 size)
Write debug information to log if we EXTRA_DEBUG is enabled Write debug information to log if we EXTRA_DEBUG is enabled
*/ */
my_bool translog_log_debug_info(TRN *trn, enum translog_debug_info_type type, my_bool translog_log_debug_info(TRN *trn __attribute__((unused)),
uchar *info, size_t length) enum translog_debug_info_type type
__attribute__((unused)),
uchar *info __attribute__((unused)),
size_t length __attribute__((unused)))
{ {
#ifdef EXTRA_DEBUG #ifdef EXTRA_DEBUG
LEX_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS + 2]; LEX_CUSTRING log_array[TRANSLOG_INTERNAL_PARTS + 2];

2
storage/maria/trnman_public.h
View File

@@ -75,7 +75,7 @@ uint16 trnman_get_state(TRN *);
void trnman_set_state(TRN *, uint16 state_bit); void trnman_set_state(TRN *, uint16 state_bit);
#else #else
#define trnman_get_state(A) 0 #define trnman_get_state(A) 0
uint16 trnman_set_state(A, B) do { } while (0) #define trnman_set_state(A, B) do { } while (0)
#endif #endif
/* Bits for 'state' */ /* Bits for 'state' */