Skip to content

M
MariaDB
Commit 21da7529 authored by calvin's avatar calvin
Browse files
Options

branches/5.1: minor non-functional changes.

parent 284aeacd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
handler/ha_innodb.cc
View file @ 21da7529
...@@ -3312,8 +3312,8 @@ build_template( ...@@ -3312,8 +3312,8 @@ build_template(
goto include_field; goto include_field;
} }
if (bitmap_is_set(table->read_set, i) || if (bitmap_is_set(table->read_set, i) ||
bitmap_is_set(table->write_set, i)) { bitmap_is_set(table->write_set, i)) {
/* This field is needed in the query */ /* This field is needed in the query */
goto include_field; goto include_field;
...@@ -3416,7 +3416,7 @@ ha_innobase::innobase_get_int_col_max_value( ...@@ -3416,7 +3416,7 @@ ha_innobase::innobase_get_int_col_max_value(
switch(field->key_type()) { switch(field->key_type()) {
/* TINY */ /* TINY */
case HA_KEYTYPE_BINARY: case HA_KEYTYPE_BINARY:
max_value = 0xFFULL; max_value = 0xFFULL;
break; break;
case HA_KEYTYPE_INT8: case HA_KEYTYPE_INT8:
...@@ -3430,7 +3430,7 @@ ha_innobase::innobase_get_int_col_max_value( ...@@ -3430,7 +3430,7 @@ ha_innobase::innobase_get_int_col_max_value(
max_value = 0x7FFFULL; max_value = 0x7FFFULL;
break; break;
/* MEDIUM */ /* MEDIUM */
case HA_KEYTYPE_UINT24: case HA_KEYTYPE_UINT24:
max_value = 0xFFFFFFULL; max_value = 0xFFFFFFULL;
break; break;
case HA_KEYTYPE_INT24: case HA_KEYTYPE_INT24:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7