1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After merge fixes.

Browse Source 
BitKeeper/deleted/.del-my_bit.h:
  Delete: include/my_bit.h
This commit is contained in:
unknown 2008-04-29 09:26:37 +03:00
parent 50ceea65cf
commit 663f971b8d
5 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/my_bit.h
View File

@ -98,12 +98,12 @@ STATIC_INLINE uint32 my_reverse_bits(uint32 key)
_my_bits_reverse_table[(key>>24) ]; _my_bits_reverse_table[(key>>24) ];
} }
#else #else /* HAVE_INLINE */
extern uint my_bit_log2(ulong value); extern uint my_bit_log2(ulong value);
extern uint32 my_round_up_to_next_power(uint32 v); extern uint32 my_round_up_to_next_power(uint32 v);
uint32 my_clear_highest_bit(uint32 v); uint32 my_clear_highest_bit(uint32 v);
uint32 my_reverse_bits(uint32 key); uint32 my_reverse_bits(uint32 key);
extern uint my_count_bits(ulonglong v); extern uint my_count_bits(ulonglong v);
extern uint my_count_bits_ushort(ushort v); extern uint my_count_bits_ushort(ushort v);
#endif #endif /* HAVE_INLINE */
C_MODE_END C_MODE_END

2
include/my_sys.h
View File

@ -290,7 +290,7 @@ enum flush_type
As my_disable_flush_pagecache_blocks is always 0, the following option As my_disable_flush_pagecache_blocks is always 0, the following option
is strictly equivalent to FLUSH_KEEP is strictly equivalent to FLUSH_KEEP
*/ */
FLUSH_FORCE_WRITE FLUSH_FORCE_WRITE,
/** /**
@brief like FLUSH_KEEP but return immediately if file is already being @brief like FLUSH_KEEP but return immediately if file is already being
flushed (even partially) by another thread; only for page cache, flushed (even partially) by another thread; only for page cache,

10
mysys/my_handler_errors.h
View File

@ -32,7 +32,7 @@ static const char *handler_error_messages[]=
"Table is crashed and last repair failed", "Table is crashed and last repair failed",
"Table was marked as crashed and should be repaired", "Table was marked as crashed and should be repaired",
"Lock timed out; Retry transaction", "Lock timed out; Retry transaction",
"Lock table is full; Restart program with a larger locktable", "Lock table is full; Restart program with a larger lock table",
"Updates are not allowed under a read only transactions", "Updates are not allowed under a read only transactions",
"Lock deadlock; Retry transaction", "Lock deadlock; Retry transaction",
"Foreign key constraint is incorrectly formed", "Foreign key constraint is incorrectly formed",
@ -46,7 +46,7 @@ static const char *handler_error_messages[]=
"Unexpected null pointer found when using spatial index", "Unexpected null pointer found when using spatial index",
"The table changed in storage engine", "The table changed in storage engine",
"There's no partition in table for the given value", "There's no partition in table for the given value",
"Row-based binlogging of row failed", "Row-based binary logging of row failed",
"Index needed in foreign key constraint", "Index needed in foreign key constraint",
"Upholding foreign key constraints would lead to a duplicate key error in " "Upholding foreign key constraints would lead to a duplicate key error in "
"some other table", "some other table",
@ -59,9 +59,9 @@ static const char *handler_error_messages[]=
"It is not possible to log this statement", "It is not possible to log this statement",
"The event was corrupt, leading to illegal data being read", "The event was corrupt, leading to illegal data being read",
"The table is of a new format not supported by this version", "The table is of a new format not supported by this version",
"The event could not be processed no other hanlder error happened", "The event could not be processed no other handler error happened",
"Got a fatal error during initialzaction of handler", "Got a fatal error during initialization of handler",
"File to short; Expected more data in file", "File too short; Expected more data in file",
"Read page with wrong checksum" "Read page with wrong checksum"
}; };

2
sql/handler.cc
View File

@ -937,7 +937,7 @@ int ha_prepare(THD *thd)
{ {
push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA), ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA),
hton_name(*ht)->str); ha_resolve_storage_engine_name(ht));
} }
} }
} }

6
storage/myisam/mi_check.c
View File

@ -1211,8 +1211,6 @@ int chk_data_link(HA_CHECK *param, MI_INFO *info, my_bool extend)
param->glob_crc+= (*info->s->calc_check_checksum)(info,record); param->glob_crc+= (*info->s->calc_check_checksum)(info,record);
link_used+= (block_info.filepos - start_recpos); link_used+= (block_info.filepos - start_recpos);
used+= (pos-start_recpos); used+= (pos-start_recpos);
case BLOCK_RECORD:
assert(0); /* Impossible */
} /* switch */ } /* switch */
if (! got_error) if (! got_error)
{ {
@ -3646,8 +3644,6 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
record)); record));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
case BLOCK_RECORD:
assert(0); /* Impossible */
} }
DBUG_RETURN(1); /* Impossible */ DBUG_RETURN(1); /* Impossible */
} }
@ -3760,8 +3756,6 @@ int sort_write_record(MI_SORT_PARAM *sort_param)
sort_param->filepos+=reclength+length; sort_param->filepos+=reclength+length;
info->s->state.split++; info->s->state.split++;
break; break;
case BLOCK_RECORD:
assert(0); /* Impossible */
} }
} }
if (sort_param->master) if (sort_param->master)