From 663f971b8d6fd121825c41bf1fffcab72aaa885f Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 29 Apr 2008 09:26:37 +0300 Subject: [PATCH] After merge fixes. BitKeeper/deleted/.del-my_bit.h: Delete: include/my_bit.h --- include/my_bit.h | 4 ++-- include/my_sys.h | 2 +- mysys/my_handler_errors.h | 10 +++++----- sql/handler.cc | 2 +- storage/myisam/mi_check.c | 6 ------ 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/include/my_bit.h b/include/my_bit.h index f4c2c424f2b..2e464e89049 100644 --- a/include/my_bit.h +++ b/include/my_bit.h @@ -98,12 +98,12 @@ STATIC_INLINE uint32 my_reverse_bits(uint32 key) _my_bits_reverse_table[(key>>24) ]; } -#else +#else /* HAVE_INLINE */ extern uint my_bit_log2(ulong value); extern uint32 my_round_up_to_next_power(uint32 v); uint32 my_clear_highest_bit(uint32 v); uint32 my_reverse_bits(uint32 key); extern uint my_count_bits(ulonglong v); extern uint my_count_bits_ushort(ushort v); -#endif +#endif /* HAVE_INLINE */ C_MODE_END diff --git a/include/my_sys.h b/include/my_sys.h index 1d009ab5508..12eb157a2b6 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -290,7 +290,7 @@ enum flush_type As my_disable_flush_pagecache_blocks is always 0, the following option is strictly equivalent to FLUSH_KEEP */ - FLUSH_FORCE_WRITE + FLUSH_FORCE_WRITE, /** @brief like FLUSH_KEEP but return immediately if file is already being flushed (even partially) by another thread; only for page cache, diff --git a/mysys/my_handler_errors.h b/mysys/my_handler_errors.h index e360af8c57e..483f1090e6a 100644 --- a/mysys/my_handler_errors.h +++ b/mysys/my_handler_errors.h @@ -32,7 +32,7 @@ static const char *handler_error_messages[]= "Table is crashed and last repair failed", "Table was marked as crashed and should be repaired", "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", "Lock deadlock; Retry transaction", "Foreign key constraint is incorrectly formed", @@ -46,7 +46,7 @@ static const char *handler_error_messages[]= "Unexpected null pointer found when using spatial index", "The table changed in storage engine", "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", "Upholding foreign key constraints would lead to a duplicate key error in " "some other table", @@ -59,9 +59,9 @@ static const char *handler_error_messages[]= "It is not possible to log this statement", "The event was corrupt, leading to illegal data being read", "The table is of a new format not supported by this version", - "The event could not be processed no other hanlder error happened", - "Got a fatal error during initialzaction of handler", - "File to short; Expected more data in file", + "The event could not be processed no other handler error happened", + "Got a fatal error during initialization of handler", + "File too short; Expected more data in file", "Read page with wrong checksum" }; diff --git a/sql/handler.cc b/sql/handler.cc index 5722a9ea23a..1fee2012542 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -937,7 +937,7 @@ int ha_prepare(THD *thd) { push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, ER_ILLEGAL_HA, ER(ER_ILLEGAL_HA), - hton_name(*ht)->str); + ha_resolve_storage_engine_name(ht)); } } } diff --git a/storage/myisam/mi_check.c b/storage/myisam/mi_check.c index 5d857d6e20d..7ee1b4702ad 100644 --- a/storage/myisam/mi_check.c +++ b/storage/myisam/mi_check.c @@ -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); link_used+= (block_info.filepos - start_recpos); used+= (pos-start_recpos); - case BLOCK_RECORD: - assert(0); /* Impossible */ } /* switch */ if (! got_error) { @@ -3646,8 +3644,6 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param) record)); DBUG_RETURN(0); } - case BLOCK_RECORD: - assert(0); /* Impossible */ } DBUG_RETURN(1); /* Impossible */ } @@ -3760,8 +3756,6 @@ int sort_write_record(MI_SORT_PARAM *sort_param) sort_param->filepos+=reclength+length; info->s->state.split++; break; - case BLOCK_RECORD: - assert(0); /* Impossible */ } } if (sort_param->master)