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 | 68c2a008a1e5fc305a735cf90bd994230729a68d (patch) | |
| tree | 86c6c0aa08ccf4c172196dfc0d398e73fd46bd93 /sql/table.cc | |
| parent | 48dfeb4de0e3444fe5ddf9aba1040707d11cfa85 (diff) | |
| parent | da7af481cda9d0fb836f010d421ce00830b69f56 (diff) | |
| download | mariadb-git-68c2a008a1e5fc305a735cf90bd994230729a68d.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/table.cc')
| -rw-r--r-- | sql/table.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/table.cc b/sql/table.cc index 1886fdb0b82..cd8e12ca852 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -820,7 +820,7 @@ int openfrm(THD *thd, const char *name, const char *alias, uint db_stat, as we need to test for NULL = NULL. */ if (field->real_maybe_null()) - key_part->key_part_flag|= HA_PART_KEY_SEG; + key_part->key_part_flag|= HA_NULL_PART; } else { // Error: shorten key |