diff options
| author | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-10-23 10:32:39 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@myoffice.izhnet.ru> | 2006-10-23 10:32:39 +0500 |
| commit | e1a142961e0ae2adcea2cfb4d399b93581a8a6eb (patch) | |
| tree | ada943515dde566ac1e6dd09b5972639f87a622e /sql/opt_range.h | |
| parent | c055efba90fc5a9e0bf15d559f0fd7679dd9be36 (diff) | |
| parent | 68c2a008a1e5fc305a735cf90bd994230729a68d (diff) | |
| download | mariadb-git-e1a142961e0ae2adcea2cfb4d399b93581a8a6eb.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
into mysql.com:/usr/home/ram/work/bug20732/my51-bug20732
mysql-test/r/range.result:
Auto merged
mysql-test/t/range.test:
Auto merged
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
manual merging.
Diffstat (limited to 'sql/opt_range.h')
| -rw-r--r-- | sql/opt_range.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/opt_range.h b/sql/opt_range.h index 6099608f7cd..a923e35b3a1 100644 --- a/sql/opt_range.h +++ b/sql/opt_range.h @@ -26,7 +26,7 @@ typedef struct st_key_part { uint16 key,part, store_length, length; - uint8 null_bit; + uint8 null_bit, flag; Field *field; Field::imagetype image_type; } KEY_PART; |