summaryrefslogtreecommitdiff
path: root/sql/sql_bitmap.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com>2005-06-01 16:35:09 +0300
committerunknown <monty@mysql.com>2005-06-01 16:35:09 +0300
commit906b210a4a51a91416d553cb744bc9c22d0bd942 (patch)
treead666c13b9844b04a96005aa6c422f8542efce7c /sql/sql_bitmap.h
parent87805b682d483611a6685afcc103f83944734c12 (diff)
downloadmariadb-git-906b210a4a51a91416d553cb744bc9c22d0bd942.tar.gz
Code cleanups during code reviews
Ensure we get error if INSERT IGNORE ... SELECT fails Fixed wrong key_part->key_length usage in index_merge client/mysql.cc: Code cleanups & simply optimizations mysql-test/r/information_schema.result: Safety mysql-test/t/information_schema.test: Safety sql/ha_ndbcluster.cc: Code cleanups sql/item.cc: Code cleanups sql/item_subselect.cc: Code cleanups sql/item_sum.cc: Code cleanups sql/opt_range.cc: Made get_index_only_read_time() static (instad of inline) to increase portability (function was not declared before use) Simple optimization Fixed wrong key_part->key_length usage in index_merge Removed not used variable n_used_covered Indentation fixes & comment cleanups sql/parse_file.cc: Code cleanups sql/sql_base.cc: Code cleanups sql/sql_bitmap.h: Added missing return sql/sql_insert.cc: Ensure we get error if INSERT IGNORE ... SELECT fails sql/sql_select.cc: Code cleanups sql/sql_show.cc: Safety fix if a LOT of errors are ignored sql/sql_update.cc: Code cleanups sql/table.cc: Code cleanups sql/table.h: Code cleanups sql/uniques.cc: Code cleanups strings/decimal.c: Simple optimization Code cleanups
Diffstat (limited to 'sql/sql_bitmap.h')
-rw-r--r--sql/sql_bitmap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index 2fd603d9381..d8e93f1fd14 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -82,7 +82,7 @@ public:
if (sizeof(buffer) >= 8)
return uint8korr(buffer);
DBUG_ASSERT(sizeof(buffer) >= 4);
- uint4korr(buffer);
+ return (ulonglong) uint4korr(buffer);
}
};