diff options
| author | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-19 16:15:30 +0500 |
|---|---|---|
| committer | unknown <ramil/ram@mysql.com/myoffice.izhnet.ru> | 2006-10-19 16:15:30 +0500 |
| commit | 4cc94e0bd522bcca2b58394ec0c54312ffd337ef (patch) | |
| tree | 86c6c0aa08ccf4c172196dfc0d398e73fd46bd93 /sql/opt_range.h | |
| parent | 717fb55ff4fe674a77b89ac9a1244f882ddf9b51 (diff) | |
| parent | 09ed9309b5ecb493c65807138818aef40a4bcd3e (diff) | |
| download | mariadb-git-4cc94e0bd522bcca2b58394ec0c54312ffd337ef.tar.gz | |
Merge mysql.com:/usr/home/ram/work/bug20732/my41-bug20732
into mysql.com:/usr/home/ram/work/bug20732/my50-bug20732
sql/opt_range.cc:
Auto merged
sql/opt_range.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
mysql-test/r/range.result:
SCCS merged
mysql-test/t/range.test:
SCCS merged
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 40a95beb894..14dafb1490a 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; |